diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:57:37 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:57:37 -0800 |
| commit | b079d671f88322733010082a590f59885eafd62e (patch) | |
| tree | 6e824cdc1f62da9516ebc2f851229b6535a33028 /arch/arm/plat-omap | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
| parent | b923d40dd4211c4ef7d4efa2bd81b7ca1d8744c1 (diff) | |
| download | kernel_samsung_smdk4412-b079d671f88322733010082a590f59885eafd62e.zip kernel_samsung_smdk4412-b079d671f88322733010082a590f59885eafd62e.tar.gz kernel_samsung_smdk4412-b079d671f88322733010082a590f59885eafd62e.tar.bz2 | |
Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
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 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); /* |