Merge branch 'topic/nomm' into for-linus

[sfrench/cifs-2.6.git] / drivers / watchdog / mixcomwd.c

diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index 407b025cb104935e9d9e7c06b50f4c912201dbb9..bc820d16699ab1df0f6ede8d55f052c5f2236043 100644 (file)
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -201,7 +201,7 @@ static long mixcomwd_ioctl(struct file *file,
        void __user *argp = (void __user *)arg;
        int __user *p = argp;
        int status;
-       static struct watchdog_info ident = {
+       static const struct watchdog_info ident = {
                .options = WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
                .firmware_version = 1,
                .identity = "MixCOM watchdog",