aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 04:26:45 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:04 -0400
commit8d82076080d909f18dea859a6767df7e3ff69241 (patch)
tree03da6954f34f73bc8fa3065fbb88507b9b41a034 /arch/um
parent818f6ef407b448cef63294b9d0f6f8a2af9cb817 (diff)
uml: fix nonremovability of watchdog
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/harddog_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 55601687b3b..a9ad4bd6d95 100644
--- 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)
69 spin_lock(&lock); 69 spin_lock(&lock);
70 if(timer_alive) 70 if(timer_alive)
71 goto err; 71 goto err;
72#ifdef CONFIG_HARDDOG_NOWAYOUT 72#ifdef CONFIG_WATCHDOG_NOWAYOUT
73 __module_get(THIS_MODULE); 73 __module_get(THIS_MODULE);
74#endif 74#endif
75 75