Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6-omap-h63xx.git] / drivers / watchdog / bfin_wdt.c

diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 309d27913fc1db6bbffcb40add1c45fd02c098eb..472be10f0686646cc52fe5add98b3d64ff6dff11 100644 (file)
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -71,7 +71,7 @@ static int nowayout = WATCHDOG_NOWAYOUT;
 static struct watchdog_info bfin_wdt_info;
 static unsigned long open_check;
 static char expect_close;
-static spinlock_t bfin_wdt_spinlock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(bfin_wdt_spinlock);
 
 /**
  *     bfin_wdt_keepalive - Keep the Userspace Watchdog Alive
@@ -390,7 +390,7 @@ static struct platform_driver bfin_wdt_driver = {
        .resume    = bfin_wdt_resume,
 };
 
-static struct file_operations bfin_wdt_fops = {
+static const struct file_operations bfin_wdt_fops = {
        .owner    = THIS_MODULE,
        .llseek   = no_llseek,
        .write    = bfin_wdt_write,