fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / v850 / kernel / rte_cb_leds.c

diff --git a/arch/v850/kernel/rte_cb_leds.c b/arch/v850/kernel/rte_cb_leds.c
index 0dd9bf1..996bd4f 100644 (file)
--- a/arch/v850/kernel/rte_cb_leds.c
+++ b/arch/v850/kernel/rte_cb_leds.c
@@ -11,7 +11,6 @@
  * Written by Miles Bader <miles@gnu.org>
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/fs.h>
@@ -25,7 +24,7 @@
 static unsigned char leds_image[LED_NUM_DIGITS] = { 0 };
 
 /* Spinlock protecting the above leds.  */
-static spinlock_t leds_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(leds_lock);
 
 /* Common body of LED read/write functions, checks POS and LEN for
    correctness, declares a variable using IMG_DECL, initialized pointing at
@@ -43,7 +42,7 @@ do {                                                                  \
                        len = LED_NUM_DIGITS - pos;                     \
                                                                        \
                if (len > 0) {                                          \
-                       int _flags;                                     \
+                       unsigned long _flags;                           \
                        const char *_end = buf + len;                   \
                        img_decl = &leds_image[pos];                    \
                                                                        \