Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  mv watchdog tree under drivers
This commit is contained in:
Linus Torvalds 2007-10-18 14:56:25 -07:00
commit ab08ed1770
65 changed files with 3 additions and 3 deletions

View File

@ -58,6 +58,8 @@ source "drivers/power/Kconfig"
source "drivers/hwmon/Kconfig"
source "drivers/watchdog/Kconfig"
source "drivers/ssb/Kconfig"
source "drivers/mfd/Kconfig"

View File

@ -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/

View File

@ -632,8 +632,6 @@ config HVCS
source "drivers/char/ipmi/Kconfig"
source "drivers/char/watchdog/Kconfig"
config DS1620
tristate "NetWinder thermometer support"
depends on ARCH_NETWINDER