From 8f7d7a5fbeb4aba38ffc6d2453d6793efa4525dd Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Thu, 5 Aug 2010 15:22:35 +0200 Subject: [PATCH] --- yaml --- r: 216874 b: refs/heads/master c: cbf27660e692d8c74087c0ccb80225207d280af1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c5f2550785af..f83ca56a6eba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55d2cb0814f4285f89be8ed474a8ae7042fb5735 +refs/heads/master: cbf27660e692d8c74087c0ccb80225207d280af1 diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c index 4477d5d7a3b5..59ca03b0e691 100644 --- a/trunk/arch/arm/mach-omap2/pm.c +++ b/trunk/arch/arm/mach-omap2/pm.c @@ -81,9 +81,12 @@ static void omap2_init_processor_devices(void) { _init_omap_device("mpu", &mpu_dev); _init_omap_device("iva", &iva_dev); - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx()) { + _init_omap_device("l3_main_1", &l3_dev); _init_omap_device("dsp", &dsp_dev); - _init_omap_device("l3_main", &l3_dev); + } else { + _init_omap_device("l3_main", &l3_dev); + } } /*