Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[mv-sheeva.git] / drivers / watchdog / cpu5wdt.c

diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index edd3475f41db7ef2494a9befb7256b0e88262c72..251c863d71ddc123481a1bb4743973c8ebde02b6 100644 (file)
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -39,7 +39,7 @@
 static int verbose;
 static int port = 0x91;
 static int ticks = 10000;
-static spinlock_t cpu5wdt_lock;
+static DEFINE_SPINLOCK(cpu5wdt_lock);
 
 #define PFX                    "cpu5wdt: "
 
@@ -223,7 +223,6 @@ static int __devinit cpu5wdt_init(void)
                                "port=0x%x, verbose=%i\n", port, verbose);
 
        init_completion(&cpu5wdt_device.stop);
-       spin_lock_init(&cpu5wdt_lock);
        cpu5wdt_device.queue = 0;
        setup_timer(&cpu5wdt_device.timer, cpu5wdt_trigger, 0);
        cpu5wdt_device.default_ticks = ticks;