diff options
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/acquirewdt.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/advantechwdt.c | 4 | ||||
| -rw-r--r-- | drivers/watchdog/alim1535_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/alim7101_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/bfin_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/geodewdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/iTCO_vendor_support.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/ib700wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/ixp4xx_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/mv64x60_wdt.c | 1 | ||||
| -rw-r--r-- | drivers/watchdog/omap_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/pcwd_pci.c | 5 | ||||
| -rw-r--r-- | drivers/watchdog/pcwd_usb.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 4 |
14 files changed, 13 insertions, 20 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 269ada2f1fc3..28d9057c9be6 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c @@ -65,7 +65,6 @@ #include <linux/ioport.h> /* For io-port access */ #include <linux/platform_device.h> /* For platform_driver framework */ #include <linux/init.h> /* For __init/__exit/... */ - #include <linux/uaccess.h> /* For copy_to_user/put_user/... */ #include <linux/io.h> /* For inb/outb/... */ diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index 220d238ee427..e6bf8d2d3d30 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c @@ -37,9 +37,9 @@ #include <linux/ioport.h> #include <linux/platform_device.h> #include <linux/init.h> +#include <linux/io.h> +#include <linux/uaccess.h> -#include <asm/io.h> -#include <asm/uaccess.h> #include <asm/system.h> #define DRV_NAME "advantechwdt" diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index 88760cb5ec13..80e323ddc4ba 100644 --- a/drivers/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c @@ -18,7 +18,6 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/pci.h> - #include <linux/uaccess.h> #include <linux/io.h> diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index c495f36c6aa9..726e75d9db7a 100644 --- a/drivers/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c @@ -31,9 +31,9 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/pci.h> - #include <linux/io.h> #include <linux/uaccess.h> + #include <asm/system.h> #define OUR_NAME "alim7101_wdt" diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 2b92818cc664..8f6e871b3fe3 100644 --- a/drivers/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c @@ -24,8 +24,8 @@ #include <linux/reboot.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <asm/blackfin.h> #include <linux/uaccess.h> +#include <asm/blackfin.h> #define stamp(fmt, args...) pr_debug("%s:%i: " fmt "\n", __func__, __LINE__, ## args) #define stampit() stamp("here i am") diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c index 30d09cbbad94..a41f57ce581a 100644 --- a/drivers/watchdog/geodewdt.c +++ b/drivers/watchdog/geodewdt.c @@ -17,8 +17,8 @@ #include <linux/fs.h> #include <linux/platform_device.h> #include <linux/reboot.h> +#include <linux/uaccess.h> -#include <asm/uaccess.h> #include <asm/geode.h> #define GEODEWDT_HZ 500 diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index 09e9534ac2e4..e9e1f7b3fb75 100644 --- a/drivers/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c @@ -31,7 +31,6 @@ #include <linux/kernel.h> /* For printk/panic/... */ #include <linux/init.h> /* For __init/__exit/... */ #include <linux/ioport.h> /* For io-port access */ - #include <linux/io.h> /* For inb/outb/... */ #include "iTCO_vendor.h" diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c index 805a54b02aa1..9eb9537c370e 100644 --- a/drivers/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c @@ -41,9 +41,9 @@ #include <linux/spinlock.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> - #include <linux/io.h> #include <linux/uaccess.h> + #include <asm/system.h> static struct platform_device *ibwdt_platform_device; diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 24e624c847ae..1bafd7b58ca5 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c @@ -22,9 +22,9 @@ #include <linux/watchdog.h> #include <linux/init.h> #include <linux/bitops.h> +#include <linux/uaccess.h> #include <asm/hardware.h> -#include <asm/uaccess.h> static int nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = 60; /* (secs) Default is 1 minute */ diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c index ac09fe4d9573..acf589dc057c 100644 --- a/drivers/watchdog/mv64x60_wdt.c +++ b/drivers/watchdog/mv64x60_wdt.c @@ -22,7 +22,6 @@ #include <linux/module.h> #include <linux/watchdog.h> #include <linux/platform_device.h> - #include <linux/mv643xx.h> #include <linux/uaccess.h> #include <linux/io.h> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index ccdf069792d9..5aae071cc045 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -40,8 +40,7 @@ #include <linux/moduleparam.h> #include <linux/clk.h> #include <linux/bitops.h> - -#include </io.h> +#include <linux/io.h> #include <linux/uaccess.h> #include <linux/hardware.h> diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index 61a89e959642..a1d31d1f750f 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c @@ -46,9 +46,8 @@ #include <linux/pci.h> /* For pci functions */ #include <linux/ioport.h> /* For io-port access */ #include <linux/spinlock.h> /* For spin_lock/spin_unlock/... */ - -#include <asm/uaccess.h> /* For copy_to_user/put_user/... */ -#include <asm/io.h> /* For inb/outb/... */ +#include <linux/uaccess.h> /* For copy_to_user/put_user/... */ +#include <linux/io.h> /* For inb/outb/... */ /* Module and version information */ #define WATCHDOG_VERSION "1.03" diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index bf443d077a1e..825102a33910 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c @@ -40,8 +40,7 @@ #include <linux/slab.h> /* For kmalloc, ... */ #include <linux/mutex.h> /* For mutex locking */ #include <linux/hid.h> /* For HID_REQ_SET_REPORT & HID_DT_REPORT */ - -#include <asm/uaccess.h> /* For copy_to_user/put_user/... */ +#include <linux/uaccess.h> /* For copy_to_user/put_user/... */ #ifdef CONFIG_USB_DEBUG diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 8cd0d53941e7..56dee3bfd4aa 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -28,11 +28,11 @@ #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/spinlock.h> - -#include <asm/hardware.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <asm/hardware.h> + #define MODULE_NAME "PNX4008-WDT: " /* WatchDog Timer - Chapter 23 Page 207 */ |