diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:23:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:23:59 +0200 |
commit | ace7f1b79670aa0c1d9f4b0442be82e565827333 (patch) | |
tree | ed4625a9cbc8e28db2b1ff9fad111c4c012508a3 /drivers/watchdog/Makefile | |
parent | a60b33cf59d1c9e0e363287fce799cb23d45660c (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into core/softirqtip-core-softirq-2008-06-25_10.23_Wed
Diffstat (limited to 'drivers/watchdog/Makefile')
-rw-r--r-- | drivers/watchdog/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 8662a6b7a30b..25b352b664d9 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -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 |