projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
drivers
/
char
/
watchdog
/
scx200_wdt.c
diff --git
a/drivers/char/watchdog/scx200_wdt.c
b/drivers/char/watchdog/scx200_wdt.c
index
fc0e034
..
d4fd0fa
100644
(file)
--- a/
drivers/char/watchdog/scx200_wdt.c
+++ b/
drivers/char/watchdog/scx200_wdt.c
@@
-25,7
+25,7
@@
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/fs.h>
-#include <linux/
pci
.h>
+#include <linux/
ioport
.h>
#include <linux/scx200.h>
#include <asm/uaccess.h>