diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-06-01 19:56:02 +0200 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-06-08 19:05:00 +0200 |
| commit | 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e (patch) | |
| tree | f02422b135326f4212585501744ab2fd2d6fb3e8 /arch/arm/mach-orion5x | |
| parent | [ARM] Kirkwood: Add the watchdog timer as a platform device. (diff) | |
| download | linux-3b937a7dbddbedd9457b33fcc8fa369c0c229c6e.tar.xz linux-3b937a7dbddbedd9457b33fcc8fa369c0c229c6e.zip | |
[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')
| -rw-r--r-- | arch/arm/mach-orion5x/common.c | 6 |
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 @@ #include <plat/ehci-orion.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" @@ -540,12 +540,12 @@ void __init orion5x_xor_init(void) /***************************************************************************** * Watchdog ****************************************************************************/ -static struct orion5x_wdt_platform_data orion5x_wdt_data = { +static struct orion_wdt_platform_data orion5x_wdt_data = { .tclk = 0, }; static struct platform_device orion5x_wdt_device = { - .name = "orion5x_wdt", + .name = "orion_wdt", .id = -1, .dev = { .platform_data = &orion5x_wdt_data, |