From: Wim Van Sebroeck Date: Fri, 17 Aug 2007 08:38:02 +0000 (+0000) Subject: mv watchdog tree under drivers X-Git-Tag: v2.6.24-rc1~290^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7e04f8c61a46d742de23af5d7ca2b41b33e40ac;p=pandora-kernel.git mv watchdog tree under drivers move watchdog tree from drivers/char/watchdog to drivers/watchdog. Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/Kconfig b/drivers/Kconfig index 4fb134d50da7..34f40ea0ba60 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 174c27eb4430..d2dc01cc73e7 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 204d53e506de..69f851854782 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 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 Reading git-diff-tree failed