summaryrefslogtreecommitdiff
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-01-25 07:18:16 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-01-27 22:00:47 +0000
commit633e81a66b7e6c22a50da860371159cfa2b06d53 (patch)
tree26a47bcb264407558310e4f84bb33dd2ec90d017 /arch/arm/mach-u300
parentfc05475f867624dddd5ea7089cf8f434f95fbec5 (diff)
downloadlinux-3.10-633e81a66b7e6c22a50da860371159cfa2b06d53.tar.gz
linux-3.10-633e81a66b7e6c22a50da860371159cfa2b06d53.tar.bz2
linux-3.10-633e81a66b7e6c22a50da860371159cfa2b06d53.zip
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>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 068526a7dda..6869052fe09 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -3,7 +3,7 @@
* arch/arm/mach-u300/core.c
*
*
- * Copyright (C) 2007-2009 ST-Ericsson AB
+ * Copyright (C) 2007-2010 ST-Ericsson AB
* License terms: GNU General Public License (GPL) version 2
* Core platform support, IRQ handling and device definitions.
* Author: Linus Walleij <linus.walleij@stericsson.com>
@@ -1400,7 +1400,7 @@ static struct coh901318_platform coh901318_platform = {
};
static struct platform_device wdog_device = {
- .name = "wdog",
+ .name = "coh901327_wdog",
.id = -1,
.num_resources = ARRAY_SIZE(wdog_resources),
.resource = wdog_resources,