diff options
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 2 | ||||
-rw-r--r-- | drivers/char/Kconfig | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig (renamed from drivers/char/watchdog/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/watchdog/Makefile (renamed from drivers/char/watchdog/Makefile) | 0 | ||||
-rw-r--r-- | drivers/watchdog/acquirewdt.c (renamed from drivers/char/watchdog/acquirewdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/advantechwdt.c (renamed from drivers/char/watchdog/advantechwdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/alim1535_wdt.c (renamed from drivers/char/watchdog/alim1535_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/alim7101_wdt.c (renamed from drivers/char/watchdog/alim7101_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/at32ap700x_wdt.c (renamed from drivers/char/watchdog/at32ap700x_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/at91rm9200_wdt.c (renamed from drivers/char/watchdog/at91rm9200_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/bfin_wdt.c (renamed from drivers/char/watchdog/bfin_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/booke_wdt.c (renamed from drivers/char/watchdog/booke_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/cpu5wdt.c (renamed from drivers/char/watchdog/cpu5wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/davinci_wdt.c (renamed from drivers/char/watchdog/davinci_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ep93xx_wdt.c (renamed from drivers/char/watchdog/ep93xx_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/eurotechwdt.c (renamed from drivers/char/watchdog/eurotechwdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/i6300esb.c (renamed from drivers/char/watchdog/i6300esb.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/iTCO_vendor_support.c (renamed from drivers/char/watchdog/iTCO_vendor_support.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/iTCO_wdt.c (renamed from drivers/char/watchdog/iTCO_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ib700wdt.c (renamed from drivers/char/watchdog/ib700wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ibmasr.c (renamed from drivers/char/watchdog/ibmasr.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/indydog.c (renamed from drivers/char/watchdog/indydog.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/iop_wdt.c (renamed from drivers/char/watchdog/iop_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ixp2000_wdt.c (renamed from drivers/char/watchdog/ixp2000_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ixp4xx_wdt.c (renamed from drivers/char/watchdog/ixp4xx_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/ks8695_wdt.c (renamed from drivers/char/watchdog/ks8695_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/machzwd.c (renamed from drivers/char/watchdog/machzwd.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mixcomwd.c (renamed from drivers/char/watchdog/mixcomwd.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mpc5200_wdt.c (renamed from drivers/char/watchdog/mpc5200_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mpc83xx_wdt.c (renamed from drivers/char/watchdog/mpc83xx_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mpc8xx_wdt.c (renamed from drivers/char/watchdog/mpc8xx_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mpcore_wdt.c (renamed from drivers/char/watchdog/mpcore_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mtx-1_wdt.c (renamed from drivers/char/watchdog/mtx-1_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/mv64x60_wdt.c (renamed from drivers/char/watchdog/mv64x60_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/omap_wdt.c (renamed from drivers/char/watchdog/omap_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/omap_wdt.h (renamed from drivers/char/watchdog/omap_wdt.h) | 0 | ||||
-rw-r--r-- | drivers/watchdog/pc87413_wdt.c (renamed from drivers/char/watchdog/pc87413_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/pcwd.c (renamed from drivers/char/watchdog/pcwd.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/pcwd_pci.c (renamed from drivers/char/watchdog/pcwd_pci.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/pcwd_usb.c (renamed from drivers/char/watchdog/pcwd_usb.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/pnx4008_wdt.c (renamed from drivers/char/watchdog/pnx4008_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/rm9k_wdt.c (renamed from drivers/char/watchdog/rm9k_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/s3c2410_wdt.c (renamed from drivers/char/watchdog/s3c2410_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sa1100_wdt.c (renamed from drivers/char/watchdog/sa1100_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sbc60xxwdt.c (renamed from drivers/char/watchdog/sbc60xxwdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sbc8360.c (renamed from drivers/char/watchdog/sbc8360.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sbc_epx_c3.c (renamed from drivers/char/watchdog/sbc_epx_c3.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sc1200wdt.c (renamed from drivers/char/watchdog/sc1200wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/sc520_wdt.c (renamed from drivers/char/watchdog/sc520_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/scx200_wdt.c (renamed from drivers/char/watchdog/scx200_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/shwdt.c (renamed from drivers/char/watchdog/shwdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/smsc37b787_wdt.c (renamed from drivers/char/watchdog/smsc37b787_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/softdog.c (renamed from drivers/char/watchdog/softdog.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/w83627hf_wdt.c (renamed from drivers/char/watchdog/w83627hf_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/w83697hf_wdt.c (renamed from drivers/char/watchdog/w83697hf_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/w83877f_wdt.c (renamed from drivers/char/watchdog/w83877f_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/w83977f_wdt.c (renamed from drivers/char/watchdog/w83977f_wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wafer5823wdt.c (renamed from drivers/char/watchdog/wafer5823wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wd501p.h (renamed from drivers/char/watchdog/wd501p.h) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wdrtas.c (renamed from drivers/char/watchdog/wdrtas.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wdt.c (renamed from drivers/char/watchdog/wdt.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wdt285.c (renamed from drivers/char/watchdog/wdt285.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wdt977.c (renamed from drivers/char/watchdog/wdt977.c) | 0 | ||||
-rw-r--r-- | drivers/watchdog/wdt_pci.c (renamed from drivers/char/watchdog/wdt_pci.c) | 0 |
65 files changed, 3 insertions, 3 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 4fb134d50da..34f40ea0ba6 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -58,6 +58,8 @@ source "drivers/power/Kconfig" source "drivers/hwmon/Kconfig" +source "drivers/watchdog/Kconfig" + source "drivers/ssb/Kconfig" source "drivers/mfd/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 174c27eb443..d2dc01cc73e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -66,7 +66,7 @@ obj-y += i2c/ obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ -obj-$(CONFIG_WATCHDOG) += char/watchdog/ +obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 204d53e506d..69f85185478 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -649,8 +649,6 @@ config HVCS source "drivers/char/ipmi/Kconfig" -source "drivers/char/watchdog/Kconfig" - config DS1620 tristate "NetWinder thermometer support" depends on ARCH_NETWINDER diff --git a/drivers/char/watchdog/Kconfig b/drivers/watchdog/Kconfig index 37bddc1802d..37bddc1802d 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig diff --git a/drivers/char/watchdog/Makefile b/drivers/watchdog/Makefile index 389f8b14ccc..389f8b14ccc 100644 --- a/drivers/char/watchdog/Makefile +++ b/drivers/watchdog/Makefile diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 85269c365a1..85269c365a1 100644 --- a/drivers/char/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c diff --git a/drivers/char/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index 8121cc24734..8121cc24734 100644 --- a/drivers/char/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c index c404fc69e7e..c404fc69e7e 100644 --- a/drivers/char/watchdog/alim1535_wdt.c +++ b/drivers/watchdog/alim1535_wdt.c diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c index 67aed9f8c36..67aed9f8c36 100644 --- a/drivers/char/watchdog/alim7101_wdt.c +++ b/drivers/watchdog/alim7101_wdt.c diff --git a/drivers/char/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c index 54a516169d0..54a516169d0 100644 --- a/drivers/char/watchdog/at32ap700x_wdt.c +++ b/drivers/watchdog/at32ap700x_wdt.c diff --git a/drivers/char/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index 38bd3737259..38bd3737259 100644 --- a/drivers/char/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c diff --git a/drivers/char/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c index 309d27913fc..309d27913fc 100644 --- a/drivers/char/watchdog/bfin_wdt.c +++ b/drivers/watchdog/bfin_wdt.c diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index d362f5bf658..d362f5bf658 100644 --- a/drivers/char/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c index 5941ca601a3..5941ca601a3 100644 --- a/drivers/char/watchdog/cpu5wdt.c +++ b/drivers/watchdog/cpu5wdt.c diff --git a/drivers/char/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 19db5302ba6..19db5302ba6 100644 --- a/drivers/char/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c diff --git a/drivers/char/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 0e4787a0bb8..0e4787a0bb8 100644 --- a/drivers/char/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c index b14e9d1f164..b14e9d1f164 100644 --- a/drivers/char/watchdog/eurotechwdt.c +++ b/drivers/watchdog/eurotechwdt.c diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index c5982502c03..c5982502c03 100644 --- a/drivers/char/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c diff --git a/drivers/char/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c index 41508399009..41508399009 100644 --- a/drivers/char/watchdog/iTCO_vendor_support.c +++ b/drivers/watchdog/iTCO_vendor_support.c diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index cd5a565bc3a..cd5a565bc3a 100644 --- a/drivers/char/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c diff --git a/drivers/char/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c index c3a60f52ccb..c3a60f52ccb 100644 --- a/drivers/char/watchdog/ib700wdt.c +++ b/drivers/watchdog/ib700wdt.c diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index 94155f6136c..94155f6136c 100644 --- a/drivers/char/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c diff --git a/drivers/char/watchdog/indydog.c b/drivers/watchdog/indydog.c index 788245bdaa7..788245bdaa7 100644 --- a/drivers/char/watchdog/indydog.c +++ b/drivers/watchdog/indydog.c diff --git a/drivers/char/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index bbbd91af754..bbbd91af754 100644 --- a/drivers/char/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c index dc7548dcaf3..dc7548dcaf3 100644 --- a/drivers/char/watchdog/ixp2000_wdt.c +++ b/drivers/watchdog/ixp2000_wdt.c diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c index 5864bb865cf..5864bb865cf 100644 --- a/drivers/char/watchdog/ixp4xx_wdt.c +++ b/drivers/watchdog/ixp4xx_wdt.c diff --git a/drivers/char/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c index 7150fb945ea..7150fb945ea 100644 --- a/drivers/char/watchdog/ks8695_wdt.c +++ b/drivers/watchdog/ks8695_wdt.c diff --git a/drivers/char/watchdog/machzwd.c b/drivers/watchdog/machzwd.c index 6d35bb112a5..6d35bb112a5 100644 --- a/drivers/char/watchdog/machzwd.c +++ b/drivers/watchdog/machzwd.c diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c index 1adf1d56027..1adf1d56027 100644 --- a/drivers/char/watchdog/mixcomwd.c +++ b/drivers/watchdog/mixcomwd.c diff --git a/drivers/char/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c index 9cfb9757662..9cfb9757662 100644 --- a/drivers/char/watchdog/mpc5200_wdt.c +++ b/drivers/watchdog/mpc5200_wdt.c diff --git a/drivers/char/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c index a0bf95fb976..a0bf95fb976 100644 --- a/drivers/char/watchdog/mpc83xx_wdt.c +++ b/drivers/watchdog/mpc83xx_wdt.c diff --git a/drivers/char/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c index 85b5734403a..85b5734403a 100644 --- a/drivers/char/watchdog/mpc8xx_wdt.c +++ b/drivers/watchdog/mpc8xx_wdt.c diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index 0d2b2773541..0d2b2773541 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c diff --git a/drivers/char/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index dcfd401a7ad..dcfd401a7ad 100644 --- a/drivers/char/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c index 0365c317f7e..0365c317f7e 100644 --- a/drivers/char/watchdog/mv64x60_wdt.c +++ b/drivers/watchdog/mv64x60_wdt.c diff --git a/drivers/char/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 719b066f73c..719b066f73c 100644 --- a/drivers/char/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c diff --git a/drivers/char/watchdog/omap_wdt.h b/drivers/watchdog/omap_wdt.h index 52a532a5114..52a532a5114 100644 --- a/drivers/char/watchdog/omap_wdt.h +++ b/drivers/watchdog/omap_wdt.h diff --git a/drivers/char/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index 3d3deae0d64..3d3deae0d64 100644 --- a/drivers/char/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c diff --git a/drivers/char/watchdog/pcwd.c b/drivers/watchdog/pcwd.c index 7b41434fac8..7b41434fac8 100644 --- a/drivers/char/watchdog/pcwd.c +++ b/drivers/watchdog/pcwd.c diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index 61a89e95964..61a89e95964 100644 --- a/drivers/char/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index 0f3fd6c9c35..0f3fd6c9c35 100644 --- a/drivers/char/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 22f8873dd09..22f8873dd09 100644 --- a/drivers/char/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c diff --git a/drivers/char/watchdog/rm9k_wdt.c b/drivers/watchdog/rm9k_wdt.c index 5c921e47156..5c921e47156 100644 --- a/drivers/char/watchdog/rm9k_wdt.c +++ b/drivers/watchdog/rm9k_wdt.c diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 5d1c15f83d2..5d1c15f83d2 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 3475f47aaa4..3475f47aaa4 100644 --- a/drivers/char/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c index e4f3cb6090b..e4f3cb6090b 100644 --- a/drivers/char/watchdog/sbc60xxwdt.c +++ b/drivers/watchdog/sbc60xxwdt.c diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index 285d8528953..285d8528953 100644 --- a/drivers/char/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c diff --git a/drivers/char/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c index 82cbd8809a6..82cbd8809a6 100644 --- a/drivers/char/watchdog/sbc_epx_c3.c +++ b/drivers/watchdog/sbc_epx_c3.c diff --git a/drivers/char/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c index 9670d47190d..9670d47190d 100644 --- a/drivers/char/watchdog/sc1200wdt.c +++ b/drivers/watchdog/sc1200wdt.c diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c index e8594c64d1e..e8594c64d1e 100644 --- a/drivers/char/watchdog/sc520_wdt.c +++ b/drivers/watchdog/sc520_wdt.c diff --git a/drivers/char/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c index d4fd0fa2f17..d4fd0fa2f17 100644 --- a/drivers/char/watchdog/scx200_wdt.c +++ b/drivers/watchdog/scx200_wdt.c diff --git a/drivers/char/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index cecbedd473a..cecbedd473a 100644 --- a/drivers/char/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c diff --git a/drivers/char/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c index d3cb0a76602..d3cb0a76602 100644 --- a/drivers/char/watchdog/smsc37b787_wdt.c +++ b/drivers/watchdog/smsc37b787_wdt.c diff --git a/drivers/char/watchdog/softdog.c b/drivers/watchdog/softdog.c index 9c369490924..9c369490924 100644 --- a/drivers/char/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c diff --git a/drivers/char/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index df33b3b5a53..df33b3b5a53 100644 --- a/drivers/char/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c index d9e821d08de..d9e821d08de 100644 --- a/drivers/char/watchdog/w83697hf_wdt.c +++ b/drivers/watchdog/w83697hf_wdt.c diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c index 3c88fe18f4f..3c88fe18f4f 100644 --- a/drivers/char/watchdog/w83877f_wdt.c +++ b/drivers/watchdog/w83877f_wdt.c diff --git a/drivers/char/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c index 15796844289..15796844289 100644 --- a/drivers/char/watchdog/w83977f_wdt.c +++ b/drivers/watchdog/w83977f_wdt.c diff --git a/drivers/char/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c index 950905d3c39..950905d3c39 100644 --- a/drivers/char/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c diff --git a/drivers/char/watchdog/wd501p.h b/drivers/watchdog/wd501p.h index a4504f40394..a4504f40394 100644 --- a/drivers/char/watchdog/wd501p.h +++ b/drivers/watchdog/wd501p.h diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c index 1d64e277567..1d64e277567 100644 --- a/drivers/char/watchdog/wdrtas.c +++ b/drivers/watchdog/wdrtas.c diff --git a/drivers/char/watchdog/wdt.c b/drivers/watchdog/wdt.c index 0a3de6a0244..0a3de6a0244 100644 --- a/drivers/char/watchdog/wdt.c +++ b/drivers/watchdog/wdt.c diff --git a/drivers/char/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index e4cf661dc89..e4cf661dc89 100644 --- a/drivers/char/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c diff --git a/drivers/char/watchdog/wdt977.c b/drivers/watchdog/wdt977.c index 7d300ff7ab0..7d300ff7ab0 100644 --- a/drivers/char/watchdog/wdt977.c +++ b/drivers/watchdog/wdt977.c diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 6baf4ae42c9..6baf4ae42c9 100644 --- a/drivers/char/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c |