]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
uml: fix nonremovability of watchdog
authorJeff Dike <jdike@addtoit.com>
Tue, 16 Oct 2007 08:26:45 +0000 (01:26 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 16 Oct 2007 16:43:04 +0000 (09:43 -0700)
The UML watchdog driver was using the wrong config variable to control whether
it can be unloaded once active.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/drivers/harddog_kern.c

index 55601687b3bcf735abadd11d555fdc7e59acc33d..a9ad4bd6d953d2255d82e3776b816165e50a94aa 100644 (file)
@@ -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