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

Commit de08341a 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:
  Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"
parents 9bf8a943 63842ccc

drivers/watchdog/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o 
obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o

obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o

obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o

CFLAGS_hpwdt.o += -O

obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o

obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o

obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o