aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-24 15:58:01 +0000
committerArnd Bergmann <arnd@arndb.de>2011-11-24 15:58:01 +0000
commit55135dfbf3dd83cb3e98deed8271b62d188404e1 (patch)
treeff9fc0b1f8c4b7901ffec8c3ed6c1cf069687ab3 /arch/arm/plat-omap
parentb70c4207821f3f895e1c4c368aa0bece9141e524 (diff)
parentb079d671f88322733010082a590f59885eafd62e (diff)
downloadkernel_samsung_smdk4412-55135dfbf3dd83cb3e98deed8271b62d188404e1.zip
kernel_samsung_smdk4412-55135dfbf3dd83cb3e98deed8271b62d188404e1.tar.gz
kernel_samsung_smdk4412-55135dfbf3dd83cb3e98deed8271b62d188404e1.tar.bz2
Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/common.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h
index c50df48..3ff3e36 100644
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@ -30,6 +30,7 @@
#include <linux/delay.h>
#include <plat/i2c.h>
+#include <plat/omap_hwmod.h>
struct sys_timer;
@@ -55,6 +56,8 @@ void am35xx_init_early(void);
void ti816x_init_early(void);
void omap4430_init_early(void);
+extern int omap_dss_reset(struct omap_hwmod *);
+
void omap_sram_init(void);
/*