Skip to contentSkip to conversation

watchdog: Make TXX9_WDT select WATCHDOG_CORE

PATCH In review Axel Lin 3 participants 4 messages Mar 26, 2012 Watchdog device drivers

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 watchdog: Make TXX9_WDT select WATCHDOG_CORE

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 <[email protected]>

---
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(-)
drivers/watchdog/Kconfig +1 -0
index f5b1ec6..3709624 100644
@@ -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.
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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 <[email protected]>
Acked-by Wolfram Sang <[email protected]>

Can we simply fold this into the original patch?

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
author
#2 lore raw
Quoted 4 lines
Acked-by Wolfram Sang <[email protected]>

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

#3 lore raw

Hi Axel,

Quoted 6 lines
Quoted 3 lines
Acked-by Wolfram Sang <[email protected]>

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.