diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 12:56:00 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 12:56:00 -0500 |
| commit | 00ca4e4c8f72f2a67466a41b12714ed8c9e10f64 (patch) | |
| tree | 51c9a45142977ee91f5fba22162bc955f0d67f90 /arch | |
| parent | 0b35a45bde561d67ffd83b352764b48f936f46bb (diff) | |
| parent | 7c17c7701cf3c176dc245aeabecb3ae4b166618f (diff) | |
Merge branch 'fixes-hwmod-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 7f8915ad5099..eef43e2e163e 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
| @@ -3247,18 +3247,14 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { | |||
| 3247 | 3247 | ||
| 3248 | /* 3430ES1-only hwmods */ | 3248 | /* 3430ES1-only hwmods */ |
| 3249 | static __initdata struct omap_hwmod *omap3430es1_hwmods[] = { | 3249 | static __initdata struct omap_hwmod *omap3430es1_hwmods[] = { |
| 3250 | &omap3xxx_iva_hwmod, | ||
| 3251 | &omap3430es1_dss_core_hwmod, | 3250 | &omap3430es1_dss_core_hwmod, |
| 3252 | &omap3xxx_mailbox_hwmod, | ||
| 3253 | NULL | 3251 | NULL |
| 3254 | }; | 3252 | }; |
| 3255 | 3253 | ||
| 3256 | /* 3430ES2+-only hwmods */ | 3254 | /* 3430ES2+-only hwmods */ |
| 3257 | static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = { | 3255 | static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = { |
| 3258 | &omap3xxx_iva_hwmod, | ||
| 3259 | &omap3xxx_dss_core_hwmod, | 3256 | &omap3xxx_dss_core_hwmod, |
| 3260 | &omap3xxx_usbhsotg_hwmod, | 3257 | &omap3xxx_usbhsotg_hwmod, |
| 3261 | &omap3xxx_mailbox_hwmod, | ||
| 3262 | NULL | 3258 | NULL |
| 3263 | }; | 3259 | }; |
| 3264 | 3260 | ||