diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 10:58:01 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 10:58:01 -0500 |
| commit | 55135dfbf3dd83cb3e98deed8271b62d188404e1 (patch) | |
| tree | ff9fc0b1f8c4b7901ffec8c3ed6c1cf069687ab3 /arch/arm/plat-omap | |
| parent | b70c4207821f3f895e1c4c368aa0bece9141e524 (diff) | |
| parent | b079d671f88322733010082a590f59885eafd62e (diff) | |
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.h | 3 |
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 c50df4814f6f..3ff3e36580f2 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | 31 | ||
| 32 | #include <plat/i2c.h> | 32 | #include <plat/i2c.h> |
| 33 | #include <plat/omap_hwmod.h> | ||
| 33 | 34 | ||
| 34 | struct sys_timer; | 35 | struct sys_timer; |
| 35 | 36 | ||
| @@ -55,6 +56,8 @@ void am35xx_init_early(void); | |||
| 55 | void ti816x_init_early(void); | 56 | void ti816x_init_early(void); |
| 56 | void omap4430_init_early(void); | 57 | void omap4430_init_early(void); |
| 57 | 58 | ||
| 59 | extern int omap_dss_reset(struct omap_hwmod *); | ||
| 60 | |||
| 58 | void omap_sram_init(void); | 61 | void omap_sram_init(void); |
| 59 | 62 | ||
| 60 | /* | 63 | /* |