Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes

[pandora-kernel.git] / arch / arm / mach-shark / leds.c

diff --git a/arch/arm/mach-shark/leds.c b/arch/arm/mach-shark/leds.c
index c9e32de..ccd4918 100644 (file)
--- a/arch/arm/mach-shark/leds.c
+++ b/arch/arm/mach-shark/leds.c
@@ -36,7 +36,7 @@ static char led_state;
 static short hw_led_state;
 static short saved_state;
 
-static DEFINE_SPINLOCK(leds_lock);
+static DEFINE_RAW_SPINLOCK(leds_lock);
 
 short sequoia_read(int addr) {
   outw(addr,0x24);
@@ -52,7 +52,7 @@ static void sequoia_leds_event(led_event_t evt)
 {
        unsigned long flags;
 
-       spin_lock_irqsave(&leds_lock, flags);
+       raw_spin_lock_irqsave(&leds_lock, flags);
 
        hw_led_state = sequoia_read(0x09);
 
@@ -144,7 +144,7 @@ static void sequoia_leds_event(led_event_t evt)
        if  (led_state & LED_STATE_ENABLED)
                sequoia_write(hw_led_state,0x09);
 
-       spin_unlock_irqrestore(&leds_lock, flags);
+       raw_spin_unlock_irqrestore(&leds_lock, flags);
 }
 
 static int __init leds_init(void)