Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / um / drivers / harddog_kern.c

diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 73c5caa7a150ea1a6757aaa2bfea26b00bc6a771..a9ad4bd6d953d2255d82e3776b816165e50a94aa 100644 (file)
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -69,7 +69,7 @@ static int harddog_open(struct inode *inode, struct file *file)
        spin_lock(&lock);
        if(timer_alive)
                goto err;
-#ifdef CONFIG_HARDDOG_NOWAYOUT
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
        __module_get(THIS_MODULE);
 #endif
 
@@ -145,7 +145,7 @@ static int harddog_ioctl(struct inode *inode, struct file *file,
        }
 }
 
-static struct file_operations harddog_fops = {
+static const struct file_operations harddog_fops = {
        .owner          = THIS_MODULE,
        .write          = harddog_write,
        .ioctl          = harddog_ioctl,