git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5dc298)
powerpc/watchdog: move booke watchdog param related code to setup-common.c
authorShaohui Xie <Shaohui.Xie@freescale.com>
Wed, 11 Jul 2012 09:56:08 +0000 (17:56 +0800)
committerKumar Gala <galak@kernel.crashing.org>
Wed, 11 Jul 2012 12:44:03 +0000 (07:44 -0500)
Currently, BOOKE watchdog code for checking "wdt" and "wdt_period" is
in setup_32.c, it cannot be used in 64-bit, so move it to a common place
setup-common.c, which will be shared by 32-bit and 64-bit.

Also, replace the simple_strtoul with kstrtol.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/kernel/setup-common.c patch | blob | history
arch/powerpc/kernel/setup_32.c patch | blob | history

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge
diff --cc arch/powerpc/kernel/setup_32.c
Simple merge
Pandora Kernel Repository