Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ca4e4c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes-hwmod-regression' of... 

Merge branch 'fixes-hwmod-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
parents 0b35a45b 7c17c770

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+0 −4
Original line number Diff line number Diff line
@@ -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

};