diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-01-25 01:18:16 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 17:00:47 -0500 |
commit | 633e81a66b7e6c22a50da860371159cfa2b06d53 (patch) | |
tree | 26a47bcb264407558310e4f84bb33dd2ec90d017 | |
parent | fc05475f867624dddd5ea7089cf8f434f95fbec5 (diff) |
ARM: 5895/2: Alter name of U300 watchdog resource
This changes the bus name of the U300 watchdog from just "wdog"
to "coh901327_wdog" which is used to match the corresponding
driver. This makes the watchdog probe properly.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-u300/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 068526a7ddac..6869052fe096 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * arch/arm/mach-u300/core.c | 3 | * arch/arm/mach-u300/core.c |
4 | * | 4 | * |
5 | * | 5 | * |
6 | * Copyright (C) 2007-2009 ST-Ericsson AB | 6 | * Copyright (C) 2007-2010 ST-Ericsson AB |
7 | * License terms: GNU General Public License (GPL) version 2 | 7 | * License terms: GNU General Public License (GPL) version 2 |
8 | * Core platform support, IRQ handling and device definitions. | 8 | * Core platform support, IRQ handling and device definitions. |
9 | * Author: Linus Walleij <linus.walleij@stericsson.com> | 9 | * Author: Linus Walleij <linus.walleij@stericsson.com> |
@@ -1400,7 +1400,7 @@ static struct coh901318_platform coh901318_platform = { | |||
1400 | }; | 1400 | }; |
1401 | 1401 | ||
1402 | static struct platform_device wdog_device = { | 1402 | static struct platform_device wdog_device = { |
1403 | .name = "wdog", | 1403 | .name = "coh901327_wdog", |
1404 | .id = -1, | 1404 | .id = -1, |
1405 | .num_resources = ARRAY_SIZE(wdog_resources), | 1405 | .num_resources = ARRAY_SIZE(wdog_resources), |
1406 | .resource = wdog_resources, | 1406 | .resource = wdog_resources, |