diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-08-08 04:29:21 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2008-08-10 16:18:07 -0400 |
commit | d6efcab8a394c6493ccc2fcaf23c5dc0a16f052d (patch) | |
tree | ac27e2061e212a8a1cf3d77ac16aa8fb7733a175 /drivers/watchdog | |
parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) |
[WATCHDOG] Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
The problem is that iTCO_vendor_support.ko is still being built while
iTCO_vendor.h claims that its functions do not exist. The following
Makefile update fixes that. It causes iTCO_vendor_support.ko to no
longer be built if CONFIG_ITCO_VENDOR_SUPPORT=n.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 049c91895699..ca3dc043d786 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
@@ -66,7 +66,10 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o | |||
66 | obj-$(CONFIG_IBMASR) += ibmasr.o | 66 | obj-$(CONFIG_IBMASR) += ibmasr.o |
67 | obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o | 67 | obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o |
68 | obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o | 68 | obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o |
69 | obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o | 69 | obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o |
70 | ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y) | ||
71 | obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o | ||
72 | endif | ||
70 | obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o | 73 | obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o |
71 | obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o | 74 | obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o |
72 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o | 75 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o |