linux-next: build failure after merge of the watchdog tree

linux-next: build failure after merge of the watchdog tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3405 bytes --]

Hi Wim,

After merging the watchdog tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/watchdog/m548x_wdt.c:31:26: error: asm/coldfire.h: No such file or directory
drivers/watchdog/m548x_wdt.c:32:26: error: asm/m548xsim.h: No such file or directory
drivers/watchdog/m548x_wdt.c:33:26: error: asm/m548xgpt.h: No such file or directory
drivers/watchdog/m548x_wdt.c: In function 'wdt_enable':
drivers/watchdog/m548x_wdt.c:47: error: implicit declaration of function '__raw_readl'
drivers/watchdog/m548x_wdt.c:47: error: 'MCF_MBAR' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:47: error: (Each undeclared identifier is reported only once
drivers/watchdog/m548x_wdt.c:47: error: for each function it appears in.)
drivers/watchdog/m548x_wdt.c:47: error: 'MCF_GPT_GMS0' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:48: error: 'MCF_GPT_GMS_TMS_GPIO' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:49: error: 'MCF_GPT_GMS_GPIO_MASK' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:50: error: 'MCF_GPT_GMS_OD' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:53: error: implicit declaration of function '__raw_writel'
drivers/watchdog/m548x_wdt.c:54: error: implicit declaration of function 'MCF_GPT_GCIR_PRE'
drivers/watchdog/m548x_wdt.c:54: error: 'MCF_BUSCLK' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:55: error: implicit declaration of function 'MCF_GPT_GCIR_CNT'
drivers/watchdog/m548x_wdt.c:55: error: 'MCF_GPT_GCIR0' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:56: error: implicit declaration of function 'MCF_GPT_GMS_OCPW'
drivers/watchdog/m548x_wdt.c:56: error: 'MCF_GPT_GMS_WDEN' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:56: error: 'MCF_GPT_GMS_CE' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c: In function 'wdt_disable':
drivers/watchdog/m548x_wdt.c:65: error: 'MCF_MBAR' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:65: error: 'MCF_GPT_GMS0' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:66: error: 'MCF_GPT_GMS_WDEN' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:66: error: 'MCF_GPT_GMS_CE' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c: In function 'wdt_keepalive':
drivers/watchdog/m548x_wdt.c:74: error: 'MCF_MBAR' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:74: error: 'MCF_GPT_GMS0' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c: In function 'm548x_wdt_init':
drivers/watchdog/m548x_wdt.c:197: error: 'MCF_MBAR' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:197: error: 'MCF_GPT_GCIR0' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c: In function 'm548x_wdt_exit':
drivers/watchdog/m548x_wdt.c:211: error: 'MCF_MBAR' undeclared (first use in this function)
drivers/watchdog/m548x_wdt.c:211: error: 'MCF_GPT_GCIR0' undeclared (first use in this function)

Caused by commit 91bb5dc5d42f400e18766f32a84ae585f61553a9 ("watchdog: Add
MCF548x watchdog driver").

I have used the watchdog tree from next-20110107 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the watchdog tree

[Wim Van Sebroeck]

Hi Stephen,

> After merging the watchdog tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

This driver is for the m68K architecture. I apparently missed checking
the dependancy in Kconfig. I'll fix it today.

Kind regards,
Wim.

[PATCH] watchdog,m68knommu: allow M548x watchdog compilation only for M548x

[Philippe De Muyter]

Hi Wim and Stephen,

On Mon, Jan 10, 2011 at 08:27:50AM +0100, Wim Van Sebroeck wrote:
> Hi Stephen,
> 
> > After merging the watchdog tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> 
> This driver is for the m68K architecture. I apparently missed checking
> the dependancy in Kconfig. I'll fix it today.

Here is my attempt :

allow M548x watchdog compilation only for M548x

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
---
 drivers/watchdog/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b742f8b..d54bea0 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -831,7 +831,7 @@ config SBC_EPX_C3_WATCHDOG
 
 config M548x_WATCHDOG 
  	tristate "MCF548x watchdog support" 
- 	depends on WATCHDOG 
+ 	depends on M548x
  	help 
  	  To compile this driver as a module, choose M here: the 
  	  module will be called m548x_wdt.
-- 
1.7.1