Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab08ed17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 54e840dd b7e04f8c

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ source "drivers/power/Kconfig" 


source "drivers/hwmon/Kconfig"



source "drivers/watchdog/Kconfig"



source "drivers/ssb/Kconfig"



source "drivers/mfd/Kconfig"

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/char/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/char/watchdog/Kconfig→drivers/watchdog/Kconfig

+0 −0

File moved.

View file