aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/common.c
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-orion5x/common.c
parent054bd3f053de54c81b20df11f354476389826e61 (diff)
[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-orion5x/common.c')
-rw-r--r--arch/arm/mach-orion5x/common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index b1c7778d9f96..c3e2bea2d054 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -31,7 +31,7 @@
31#include <plat/ehci-orion.h> 31#include <plat/ehci-orion.h>
32#include <plat/mv_xor.h> 32#include <plat/mv_xor.h>
33#include <plat/orion_nand.h> 33#include <plat/orion_nand.h>
34#include <plat/orion5x_wdt.h> 34#include <plat/orion_wdt.h>
35#include <plat/time.h> 35#include <plat/time.h>
36#include "common.h" 36#include "common.h"
37 37
@@ -540,12 +540,12 @@ void __init orion5x_xor_init(void)
540/***************************************************************************** 540/*****************************************************************************
541 * Watchdog 541 * Watchdog
542 ****************************************************************************/ 542 ****************************************************************************/
543static struct orion5x_wdt_platform_data orion5x_wdt_data = { 543static struct orion_wdt_platform_data orion5x_wdt_data = {
544 .tclk = 0, 544 .tclk = 0,
545}; 545};
546 546
547static struct platform_device orion5x_wdt_device = { 547static struct platform_device orion5x_wdt_device = {
548 .name = "orion5x_wdt", 548 .name = "orion_wdt",
549 .id = -1, 549 .id = -1,
550 .dev = { 550 .dev = {
551 .platform_data = &orion5x_wdt_data, 551 .platform_data = &orion5x_wdt_data,