summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 09:56:00 -0800
committerOlof Johansson <olof@lixom.net>2011-12-20 09:56:00 -0800
commit00ca4e4c8f72f2a67466a41b12714ed8c9e10f64 (patch)
tree51c9a45142977ee91f5fba22162bc955f0d67f90
parent0b35a45bde561d67ffd83b352764b48f936f46bb (diff)
parent7c17c7701cf3c176dc245aeabecb3ae4b166618f (diff)
downloadop-kernel-dev-00ca4e4c8f72f2a67466a41b12714ed8c9e10f64.zip
op-kernel-dev-00ca4e4c8f72f2a67466a41b12714ed8c9e10f64.tar.gz
Merge branch 'fixes-hwmod-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c4
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 7f8915a..eef43e2 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[] = {
/* 3430ES1-only hwmods */
static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
- &omap3xxx_iva_hwmod,
&omap3430es1_dss_core_hwmod,
- &omap3xxx_mailbox_hwmod,
NULL
};
/* 3430ES2+-only hwmods */
static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
- &omap3xxx_iva_hwmod,
&omap3xxx_dss_core_hwmod,
&omap3xxx_usbhsotg_hwmod,
- &omap3xxx_mailbox_hwmod,
NULL
};
OpenPOWER on IntegriCloud