Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Jean Delvare and committed by
Wim Van Sebroeck
d6efcab8 796aadeb

+4 -1
+4 -1
drivers/watchdog/Makefile
··· 66 66 obj-$(CONFIG_IBMASR) += ibmasr.o 67 67 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o 68 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 73 obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o 71 74 obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o 72 75 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o