[PATCH] watchdog: Make TXX9_WDT select WATCHDOG_CORE

[PATCH] watchdog: Make TXX9_WDT select WATCHDOG_CORE

[Axel Lin]

This is required after converting to watchdog core API.

Fix below build errors:
  LD      .tmp_vmlinux1
drivers/built-in.o: In function `txx9wdt_probe':
txx9wdt.c:(.init.text+0x3530): undefined reference to `watchdog_register_device'
drivers/built-in.o: In function `txx9wdt_remove':
txx9wdt.c:(.exit.text+0x158): undefined reference to `watchdog_unregister_device'
make: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I have this change in my source tree but forgot to add it when
generating the patch converting txx9_wdt to watchdog framework.

 drivers/watchdog/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f5b1ec6..3709624 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1003,6 +1003,7 @@ config AR7_WDT
 config TXX9_WDT
 	tristate "Toshiba TXx9 Watchdog Timer"
 	depends on CPU_TX39XX || CPU_TX49XX
+	select WATCHDOG_CORE
 	help
 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
 
-- 
1.7.5.4

Re: [PATCH] watchdog: Make TXX9_WDT select WATCHDOG_CORE

[Wolfram Sang]

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

On Mon, Mar 26, 2012 at 01:28:33PM +0800, Axel Lin wrote:
> This is required after converting to watchdog core API.
> 
> Fix below build errors:
>   LD      .tmp_vmlinux1
> drivers/built-in.o: In function `txx9wdt_probe':
> txx9wdt.c:(.init.text+0x3530): undefined reference to `watchdog_register_device'
> drivers/built-in.o: In function `txx9wdt_remove':
> txx9wdt.c:(.exit.text+0x158): undefined reference to `watchdog_unregister_device'
> make: *** [.tmp_vmlinux1] Error 1
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

Can we simply fold this into the original patch?

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

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

Re: [PATCH] watchdog: Make TXX9_WDT select WATCHDOG_CORE

[Axel Lin]

>
> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
>
> Can we simply fold this into the original patch?
Wim already applied the original patch.
I found this build error while compiling with today's linux-next.
So I think this need to be a separate patch.

Regards,
Axel

Re: [PATCH] watchdog: Make TXX9_WDT select WATCHDOG_CORE

[Wim Van Sebroeck]

Hi Axel,

> > Acked-by: Wolfram Sang <w.sang@pengutronix.de>
> >
> > Can we simply fold this into the original patch?
> Wim already applied the original patch.
> I found this build error while compiling with today's linux-next.
> So I think this need to be a separate patch.

I folded this into the original patch.

Can you test what is in linux-watchdog-next now?

Thanks,
Wim.