summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-06-01 13:56:02 -0400
committerNicolas Pitre <nico@cam.org>2009-06-08 13:05:00 -0400
commit3b937a7dbddbedd9457b33fcc8fa369c0c229c6e (patch)
treef02422b135326f4212585501744ab2fd2d6fb3e8 /arch/arm/mach-kirkwood
parent054bd3f053de54c81b20df11f354476389826e61 (diff)
downloadop-kernel-dev-3b937a7dbddbedd9457b33fcc8fa369c0c229c6e.zip
op-kernel-dev-3b937a7dbddbedd9457b33fcc8fa369c0c229c6e.tar.gz
[ARM] Orion/Kirkwood: rename orion5x_wdt to orion_wdt
The Orion watchdog driver is also used on Kirkwood. Convention is to use orion5x for stuff specific to 88F5xxx Orion chips and simply "orion" for shared stuff across SoCs including Kirkwood. Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index a053184..3da32b1 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -30,7 +30,7 @@
#include <plat/mvsdio.h>
#include <plat/mv_xor.h>
#include <plat/orion_nand.h>
-#include <plat/orion5x_wdt.h>
+#include <plat/orion_wdt.h>
#include <plat/time.h>
#include "common.h"
@@ -771,12 +771,12 @@ static void __init kirkwood_xor1_init(void)
/*****************************************************************************
* Watchdog
****************************************************************************/
-static struct orion5x_wdt_platform_data kirkwood_wdt_data = {
+static struct orion_wdt_platform_data kirkwood_wdt_data = {
.tclk = 0,
};
static struct platform_device kirkwood_wdt_device = {
- .name = "orion5x_wdt",
+ .name = "orion_wdt",
.id = -1,
.dev = {
.platform_data = &kirkwood_wdt_data,
OpenPOWER on IntegriCloud