git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
ixp4xx_wdt.c
diff --git
a/drivers/char/watchdog/ixp4xx_wdt.c
b/drivers/char/watchdog/ixp4xx_wdt.c
index
a6781de
..
82396e0
100644
(file)
--- a/
drivers/char/watchdog/ixp4xx_wdt.c
+++ b/
drivers/char/watchdog/ixp4xx_wdt.c
@@
-22,9
+22,9
@@
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
+#include <linux/bitops.h>
#include <asm/hardware.h>
#include <asm/hardware.h>
-#include <asm/bitops.h>
#include <asm/uaccess.h>
#ifdef CONFIG_WATCHDOG_NOWAYOUT
#include <asm/uaccess.h>
#ifdef CONFIG_WATCHDOG_NOWAYOUT
@@
-216,7
+216,7
@@
static void __exit ixp4xx_wdt_exit(void)
module_init(ixp4xx_wdt_init);
module_exit(ixp4xx_wdt_exit);
module_init(ixp4xx_wdt_init);
module_exit(ixp4xx_wdt_exit);
-MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net
">
);
+MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net
>"
);
MODULE_DESCRIPTION("IXP4xx Network Processor Watchdog");
module_param(heartbeat, int, 0);
MODULE_DESCRIPTION("IXP4xx Network Processor Watchdog");
module_param(heartbeat, int, 0);