From: Andrzej Zaborowski Date: Thu, 7 Dec 2006 01:13:48 +0000 (-0800) Subject: ARM: OMAP: correct misc 15xx and non-15xx platform code X-Git-Tag: v2.6.21-omap1~118^2~77 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ac7830c08088f47f5949ba1d974630e9b7b3b524;p=linux-2.6-omap-h63xx.git ARM: OMAP: correct misc 15xx and non-15xx platform code Disable accesses to SOFT_REQ_REG2 and ULPD_SOFT_DISABLE_REQ_REG registers for 15xx processors that don't have these registers. Enable level 2 interrupt handler for processors that identify as OMAP 15xx (e.g 310) and not 1510 specifically. Also fix the following compiler warning (only visible with CONFIG_OMAP_RESET_CLOCKS): arch/arm/mach-omap1/clock.c: In function 'omap1_clk_disable_unused': arch/arm/mach-omap1/clock.c:634: warning: 'return' with a value, in function returning void Signed-off-by: Andrzej Zaborowski Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index f625f6dd228..6d4860c8da5 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -494,7 +494,7 @@ static int omap1_clk_enable_generic(struct clk *clk) } } - return 0; + return; } static void omap1_clk_disable_generic(struct clk *clk)