From: Jean Delvare <khali@linux-fr.org>
To: LKML <linux-kernel@vger.kernel.org>, Wim Van Sebroeck <wim@iguana.be>
Subject: [PATCH] watchdog: Fix build with CONFIG_ITCO_VENDOR_SUPPORT=n
Date: Fri, 8 Aug 2008 10:29:21 +0200 [thread overview]
Message-ID: <20080808102921.3ec92c4f@hyperion.delvare> (raw)
Kernel 2.6.27-rc2-git2 fails to build with
CONFIG_ITCO_VENDOR_SUPPORT=n:
CC [M] drivers/watchdog/iTCO_vendor_support.o
drivers/watchdog/iTCO_vendor_support.c:247: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:249: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:255: error: 'iTCO_vendor_pre_start' undeclared here (not in a function)
drivers/watchdog/iTCO_vendor_support.c:255: warning: type defaults to 'int' in declaration of 'iTCO_vendor_pre_start'
drivers/watchdog/iTCO_vendor_support.c:257: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:258: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:264: error: 'iTCO_vendor_pre_stop' undeclared here (not in a function)
drivers/watchdog/iTCO_vendor_support.c:264: warning: type defaults to 'int' in declaration of 'iTCO_vendor_pre_stop'
drivers/watchdog/iTCO_vendor_support.c:266: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:267: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:273: error: 'iTCO_vendor_pre_keepalive' undeclared here (not in a function)
drivers/watchdog/iTCO_vendor_support.c:273: warning: type defaults to 'int' in declaration of 'iTCO_vendor_pre_keepalive'
drivers/watchdog/iTCO_vendor_support.c:275: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:276: error: expected identifier or '(' before '{' token
drivers/watchdog/iTCO_vendor_support.c:280: error: 'iTCO_vendor_pre_set_heartbeat' undeclared here (not in a function)
drivers/watchdog/iTCO_vendor_support.c:280: warning: type defaults to 'int' in declaration of 'iTCO_vendor_pre_set_heartbeat'
drivers/watchdog/iTCO_vendor_support.c:282:39: error: macro "iTCO_vendor_check_noreboot_on" passed 1 arguments, but takes just 0
drivers/watchdog/iTCO_vendor_support.c:283: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
drivers/watchdog/iTCO_vendor_support.c:291: error: 'iTCO_vendor_check_noreboot_on' undeclared here (not in a function)
drivers/watchdog/iTCO_vendor_support.c:291: warning: type defaults to 'int' in declaration of 'iTCO_vendor_check_noreboot_on'
make[2]: *** [drivers/watchdog/iTCO_vendor_support.o] Error 1
make[1]: *** [drivers/watchdog] Error 2
make: *** [drivers] Error 2
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>
Cc: Wim Van Sebroeck <wim@iguana.be>
---
drivers/watchdog/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- linux-2.6.27-rc2.orig/drivers/watchdog/Makefile 2008-08-08 10:14:31.000000000 +0200
+++ linux-2.6.27-rc2/drivers/watchdog/Makefile 2008-08-08 10:15:56.000000000 +0200
@@ -66,7 +66,10 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o
obj-$(CONFIG_IBMASR) += ibmasr.o
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_ITCO_WDT) += iTCO_wdt.o
+ifeq ($(CONFIG_ITCO_VENDOR_SUPPORT),y)
+obj-$(CONFIG_ITCO_WDT) += iTCO_vendor_support.o
+endif
obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o
obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
--
Jean Delvare
next reply other threads:[~2008-08-08 8:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-08 8:29 Jean Delvare [this message]
2008-08-08 17:49 ` Wim Van Sebroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080808102921.3ec92c4f@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®