From 06fa2ff1d59509076e98c9419f446d3f2a71ec9d Mon Sep 17 00:00:00 2001 From: Sebastien Guiriec Date: Sun, 10 Feb 2013 11:17:16 -0700 Subject: [PATCH] --- yaml --- r: 359855 b: refs/heads/master c: 5cebb23c6cbcfcae1d0586d07898677716f133bc h: refs/heads/master i: 359853: 2d4de519591a5fe4a89bf0f2717ba0fc862db5b3 359851: 91a8cfbdc6835b8b32c1ce3f19f4c615b574e449 359847: aa9af6e721ff64021d05b9583c3dd9a768c67b99 359839: 74b51eed1cecdfeb7ab48d3a478a8448ebc8623e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 51cd74283bb1..7f0a7dba3d44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f0c5996b73b31b482136462c8118148469c2030 +refs/heads/master: 5cebb23c6cbcfcae1d0586d07898677716f133bc diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index a30c113a7f5e..f9084949b1ee 100644 --- a/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/trunk/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -6325,7 +6325,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l3_main_1__l3_main_3, &omap44xx_l3_main_2__l3_main_3, &omap44xx_l4_cfg__l3_main_3, - /* &omap44xx_aess__l4_abe, */ + &omap44xx_aess__l4_abe, &omap44xx_dsp__l4_abe, &omap44xx_l3_main_1__l4_abe, &omap44xx_mpu__l4_abe, @@ -6334,8 +6334,8 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_cfg__l4_wkup, &omap44xx_mpu__mpu_private, &omap44xx_l4_cfg__ocp_wp_noc, - /* &omap44xx_l4_abe__aess, */ - /* &omap44xx_l4_abe__aess_dma, */ + &omap44xx_l4_abe__aess, + &omap44xx_l4_abe__aess_dma, &omap44xx_l3_main_2__c2c, &omap44xx_l4_wkup__counter_32k, &omap44xx_l4_cfg__ctrl_module_core,