mv watchdog tree under drivers

move watchdog tree from drivers/char/watchdog to drivers/watchdog.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 4fb134d..34f40ea 100644 (file)
--- 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 174c27e..d2dc01c 100644 (file)
--- 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 204d53e..69f8518 100644 (file)
--- 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
similarity index 100%
rename from drivers/char/watchdog/Kconfig
rename to drivers/watchdog/Kconfig

diff --git a/drivers/char/watchdog/Makefile b/drivers/watchdog/Makefile
similarity index 100%
rename from drivers/char/watchdog/Makefile
rename to drivers/watchdog/Makefile

diff --git a/drivers/char/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
similarity index 100%
rename from drivers/char/watchdog/acquirewdt.c
rename to drivers/watchdog/acquirewdt.c

diff --git a/drivers/char/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
similarity index 100%
rename from drivers/char/watchdog/advantechwdt.c
rename to drivers/watchdog/advantechwdt.c

diff --git a/drivers/char/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
similarity index 100%
rename from drivers/char/watchdog/alim1535_wdt.c
rename to drivers/watchdog/alim1535_wdt.c

diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
similarity index 100%
rename from drivers/char/watchdog/alim7101_wdt.c
rename to drivers/watchdog/alim7101_wdt.c

diff --cc drivers/watchdog/at32ap700x_wdt.c
Simple merge

diff --cc drivers/watchdog/at91rm9200_wdt.c
Simple merge

diff --cc drivers/watchdog/bfin_wdt.c
Simple merge

diff --cc drivers/watchdog/booke_wdt.c
Simple merge

diff --cc drivers/watchdog/cpu5wdt.c
Simple merge

diff --cc drivers/watchdog/davinci_wdt.c
Simple merge

diff --cc drivers/watchdog/ep93xx_wdt.c
Simple merge

diff --cc drivers/watchdog/eurotechwdt.c
Simple merge

diff --cc drivers/watchdog/i6300esb.c
Simple merge

diff --cc drivers/watchdog/iTCO_vendor_support.c
Simple merge

diff --cc drivers/watchdog/iTCO_wdt.c
Simple merge

diff --cc drivers/watchdog/ib700wdt.c
Simple merge

diff --cc drivers/watchdog/ibmasr.c
Simple merge

diff --cc drivers/watchdog/indydog.c
Simple merge

diff --cc drivers/watchdog/iop_wdt.c
Simple merge

diff --cc drivers/watchdog/ixp2000_wdt.c
Simple merge

diff --cc drivers/watchdog/ixp4xx_wdt.c
Simple merge

diff --cc drivers/watchdog/ks8695_wdt.c
Simple merge

diff --cc drivers/watchdog/machzwd.c
Simple merge

diff --cc drivers/watchdog/mixcomwd.c
Simple merge

diff --cc drivers/watchdog/mpc5200_wdt.c
Simple merge

diff --cc drivers/watchdog/mpc83xx_wdt.c
Simple merge

diff --cc drivers/watchdog/mpc8xx_wdt.c
Simple merge

diff --cc drivers/watchdog/mpcore_wdt.c
Simple merge

diff --cc drivers/watchdog/mtx-1_wdt.c
Simple merge

diff --cc drivers/watchdog/mv64x60_wdt.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.h
Simple merge

diff --cc drivers/watchdog/pc87413_wdt.c
Simple merge

diff --cc drivers/watchdog/pcwd.c
Simple merge

diff --cc drivers/watchdog/pcwd_pci.c
Simple merge

diff --cc drivers/watchdog/pcwd_usb.c
Simple merge

diff --cc drivers/watchdog/pnx4008_wdt.c
Simple merge

diff --cc drivers/watchdog/rm9k_wdt.c
Simple merge

diff --cc drivers/watchdog/s3c2410_wdt.c
Simple merge

diff --cc drivers/watchdog/sa1100_wdt.c
Simple merge

diff --cc drivers/watchdog/sbc60xxwdt.c
Simple merge

diff --cc drivers/watchdog/sbc8360.c
Simple merge

diff --cc drivers/watchdog/sbc_epx_c3.c
Simple merge

diff --cc drivers/watchdog/sc1200wdt.c
Simple merge

diff --cc drivers/watchdog/sc520_wdt.c
Simple merge

diff --cc drivers/watchdog/scx200_wdt.c
Simple merge

diff --cc drivers/watchdog/shwdt.c
Simple merge

diff --cc drivers/watchdog/smsc37b787_wdt.c
Simple merge

diff --cc drivers/watchdog/softdog.c
Simple merge

diff --cc drivers/watchdog/w83627hf_wdt.c
Simple merge

diff --cc drivers/watchdog/w83697hf_wdt.c
Simple merge

diff --cc drivers/watchdog/w83877f_wdt.c
Simple merge

diff --cc drivers/watchdog/w83977f_wdt.c
Simple merge

diff --cc drivers/watchdog/wafer5823wdt.c
Simple merge

diff --cc drivers/watchdog/wd501p.h
Simple merge

diff --cc drivers/watchdog/wdrtas.c
Simple merge

diff --cc drivers/watchdog/wdt.c
Simple merge

diff --cc drivers/watchdog/wdt285.c
Simple merge

diff --cc drivers/watchdog/wdt977.c
Simple merge

diff --cc drivers/watchdog/wdt_pci.c
Simple merge