diff options
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/at91rm9200_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/davinci_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/iop_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/ixp2000_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/ixp4xx_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/ks8695_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/omap_wdt.c | 5 | ||||
| -rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 3 | ||||
| -rw-r--r-- | drivers/watchdog/s3c2410_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 8 | ||||
| -rw-r--r-- | drivers/watchdog/wdt285.c | 2 |
12 files changed, 17 insertions, 23 deletions
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index 2313f44144f..bacd867dd22 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c @@ -21,8 +21,7 @@ #include <linux/types.h> #include <linux/watchdog.h> #include <linux/uaccess.h> -#include <asm/arch/at91_st.h> - +#include <mach/at91_st.h> #define WDT_DEFAULT_TIME 5 /* seconds */ #define WDT_MAX_TIME 256 /* seconds */ diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 802aeba347a..2e136028673 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -24,8 +24,7 @@ #include <linux/spinlock.h> #include <linux/uaccess.h> #include <linux/io.h> - -#include <asm/hardware.h> +#include <mach/hardware.h> #define MODULE_NAME "DAVINCI-WDT: " diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 07b74a76892..e9f950ff86e 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -29,8 +29,7 @@ #include <linux/watchdog.h> #include <linux/timer.h> #include <linux/uaccess.h> - -#include <asm/hardware.h> +#include <mach/hardware.h> #define WDT_VERSION "0.3" #define PFX "ep93xx_wdt: " diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index 8278b13f77c..96eb2cbe587 100644 --- a/drivers/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c @@ -32,7 +32,7 @@ #include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/uaccess.h> -#include <asm/hardware.h> +#include <mach/hardware.h> static int nowayout = WATCHDOG_NOWAYOUT; static unsigned long wdt_status; diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c index a77f69d5287..4f4b35a20d8 100644 --- a/drivers/watchdog/ixp2000_wdt.c +++ b/drivers/watchdog/ixp2000_wdt.c @@ -26,8 +26,7 @@ #include <linux/init.h> #include <linux/bitops.h> #include <linux/uaccess.h> - -#include <asm/hardware.h> +#include <mach/hardware.h> static int nowayout = WATCHDOG_NOWAYOUT; static unsigned int heartbeat = 60; /* (secs) Default is 1 minute */ diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index ef3157dc9ac..41264a5f173 100644 --- a/drivers/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c @@ -23,8 +23,7 @@ #include <linux/init.h> #include <linux/bitops.h> #include <linux/uaccess.h> - -#include <asm/hardware.h> +#include <mach/hardware.h> static int nowayout = WATCHDOG_NOWAYOUT; static int heartbeat = 60; /* (secs) Default is 1 minute */ diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index f8566d5c62f..0b798fdaa37 100644 --- a/drivers/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c @@ -21,8 +21,7 @@ #include <linux/watchdog.h> #include <linux/io.h> #include <linux/uaccess.h> -#include <asm/arch/regs-timer.h> - +#include <mach/regs-timer.h> #define WDT_DEFAULT_TIME 5 /* seconds */ #define WDT_MAX_TIME 171 /* seconds */ diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 6f5420f478a..3a11dadfd8e 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -42,9 +42,8 @@ #include <linux/bitops.h> #include <linux/io.h> #include <linux/uaccess.h> -#include <linux/hardware.h> - -#include <asm/arch/prcm.h> +#include <mach/hardware.h> +#include <mach/prcm.h> #include "omap_wdt.h" diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 6eadf5ebb9b..0ed84162437 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -30,8 +30,7 @@ #include <linux/spinlock.h> #include <linux/uaccess.h> #include <linux/io.h> - -#include <asm/hardware.h> +#include <mach/hardware.h> #define MODULE_NAME "PNX4008-WDT: " diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index c417fb5e913..3da2b90d2fe 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -49,7 +49,7 @@ #include <linux/uaccess.h> #include <linux/io.h> -#include <asm/arch/map.h> +#include <mach/map.h> #undef S3C_VA_WATCHDOG #define S3C_VA_WATCHDOG (0) diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 27d6898a7c9..31a48437dc3 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -29,10 +29,11 @@ #include <linux/uaccess.h> #ifdef CONFIG_ARCH_PXA -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> #endif -#include <asm/hardware.h> +#include <mach/reset.h> +#include <mach/hardware.h> #define OSCR_FREQ CLOCK_TICK_RATE @@ -159,7 +160,8 @@ static int __init sa1100dog_init(void) * we suspend, RCSR will be cleared, and the watchdog * reset reason will be lost. */ - boot_status = (RCSR & RCSR_WDR) ? WDIOF_CARDRESET : 0; + boot_status = (reset_status & RESET_STATUS_WATCHDOG) ? + WDIOF_CARDRESET : 0; pre_margin = OSCR_FREQ * margin; ret = misc_register(&sa1100dog_miscdev); diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index fea398a4ca3..c8d7f1b2df0 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c @@ -28,8 +28,8 @@ #include <linux/interrupt.h> #include <linux/uaccess.h> #include <linux/irq.h> +#include <mach/hardware.h> -#include <asm/hardware.h> #include <asm/mach-types.h> #include <asm/hardware/dec21285.h> |