Skip to contentSkip to conversation

rdc321x: remove watchdog file

PATCH Applied Florian Fainelli 2 participants 6 messages Feb 25, 2008 – Mar 6, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rdc321x: remove watchdog file

This driver should be moved to drivers/watchdog so let's remove the arch/x86/mach-rdc321x/wdt.c file.

---

arch/x86/mach-rdc321x/Makefile +1 -1
index 1faac81..8325b4c 100644
@@ -1,5 +1,5 @@
 #
 # Makefile for the RDC321x specific parts of the kernel
 #
-obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o wdt.o
+obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o
 
arch/x86/mach-rdc321x/wdt.c deleted +0 -275

275 lines not on this page · raw message

Applied
#1 lore raw
Quoted 2 lines · Florian Fainelli

This driver should be moved to drivers/watchdog so let's remove the arch/x86/mach-rdc321x/wdt.c file.

thanks, applied. I guess i should push this change upstream only once the new watchdog driver has been committed to drivers/watchdog/ ?

(If that's a completely new driver then please Cc: me to the driver submission so that i can track that trigger condition properly.)

Ingo

#2 lore raw

Hi Ingo,

Le lundi 25 février 2008, Ingo Molnar a écrit :

Quoted 2 lines

thanks, applied. I guess i should push this change upstream only once the new watchdog driver has been committed to drivers/watchdog/ ?

Yes it would be better, thank you very much !

#3 lore raw
In reply to Ingo Molnar

Hi Ingo,

Le lundi 25 février 2008, Ingo Molnar a écrit :

Quoted 2 lines

thanks, applied. I guess i should push this change upstream only once the new watchdog driver has been committed to drivers/watchdog/ ?

Can you please trigger the patch now. Wim has accepted the RDC built-in watchdog driver. See :
http://git.kernel.org/?p=linux/kernel/git/wim/linux-2.6-watchdog-mm.git;a=commit;h=b2de97cf901162e0a5936b2bbdae27ec1e55455d

Thank you very much.

#4 lore raw
Quoted 11 lines · Florian Fainelli

Hi Ingo,

Le lundi 25 février 2008, Ingo Molnar a écrit :

Quoted 2 lines

thanks, applied. I guess i should push this change upstream only once the new watchdog driver has been committed to drivers/watchdog/ ?

Can you please trigger the patch now. Wim has accepted the RDC built-in watchdog driver. See :
http://git.kernel.org/?p=linux/kernel/git/wim/linux-2.6-watchdog-mm.git;a=commit;h=b2de97cf901162e0a5936b2bbdae27ec1e55455d

Thank you very much.

should i do this now, or once Wim's tree has been merged into Linus's tree?

Ingo

#5 lore raw

Le jeudi 6 mars 2008, Ingo Molnar a écrit :

Quoted 2 lines

should i do this now, or once Wim's tree has been merged into Linus's tree?

You can do it now, it is fine with me. Thanks