Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / watchdog / w83977f_wdt.c

diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 0560182a1d09049230e88846579b3283bbed97b5..6e6743d1066fb9d4aa9dcf6affa7d534ec374210 100644 (file)
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -371,7 +371,7 @@ static ssize_t wdt_write(struct file *file, const char __user *buf,
  *      according to their available features.
  */
 
-static struct watchdog_info ident = {
+static const struct watchdog_info ident = {
        .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING,
        .firmware_version =     1,
        .identity = WATCHDOG_NAME,