diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/char/watchdog | |
| parent | 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (diff) | |
| parent | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/watchdog')
| -rw-r--r-- | drivers/char/watchdog/omap_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/char/watchdog/sc1200wdt.c | 1 | ||||
| -rw-r--r-- | drivers/char/watchdog/scx200_wdt.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/char/watchdog/omap_wdt.c index 84074a697dce..b36fa8de2131 100644 --- a/drivers/char/watchdog/omap_wdt.c +++ b/drivers/char/watchdog/omap_wdt.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/miscdevice.h> | 34 | #include <linux/miscdevice.h> |
| 35 | #include <linux/watchdog.h> | 35 | #include <linux/watchdog.h> |
| 36 | #include <linux/reboot.h> | 36 | #include <linux/reboot.h> |
| 37 | #include <linux/smp_lock.h> | ||
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/err.h> | 38 | #include <linux/err.h> |
| 40 | #include <linux/platform_device.h> | 39 | #include <linux/platform_device.h> |
diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/char/watchdog/sc1200wdt.c index 1e4a8d751a71..2f7ba7a514fe 100644 --- a/drivers/char/watchdog/sc1200wdt.c +++ b/drivers/char/watchdog/sc1200wdt.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 39 | #include <linux/pnp.h> | 39 | #include <linux/pnp.h> |
| 40 | #include <linux/fs.h> | 40 | #include <linux/fs.h> |
| 41 | #include <linux/pci.h> | ||
| 42 | 41 | ||
| 43 | #include <asm/semaphore.h> | 42 | #include <asm/semaphore.h> |
| 44 | #include <asm/io.h> | 43 | #include <asm/io.h> |
diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/char/watchdog/scx200_wdt.c index fc0e0347f9d2..d4fd0fa2f176 100644 --- a/drivers/char/watchdog/scx200_wdt.c +++ b/drivers/char/watchdog/scx200_wdt.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/notifier.h> | 25 | #include <linux/notifier.h> |
| 26 | #include <linux/reboot.h> | 26 | #include <linux/reboot.h> |
| 27 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 28 | #include <linux/pci.h> | 28 | #include <linux/ioport.h> |
| 29 | #include <linux/scx200.h> | 29 | #include <linux/scx200.h> |
| 30 | 30 | ||
| 31 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |