aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-06-06 09:53:00 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-06-11 09:09:20 +0100
commit55ba86bc6c33ce8b690fdf20ab485ef94cccd423 (patch)
tree0e800676b302ffc95c7ace35220ae4ed7f40da7f /arch/arm
parent[ARM] 4442/1: OSIRIS: Fix CPLD register definitions (diff)
downloadlinux-dev-55ba86bc6c33ce8b690fdf20ab485ef94cccd423.tar.xz
linux-dev-55ba86bc6c33ce8b690fdf20ab485ef94cccd423.zip
[ARM] 4443/1: OSIRIS: Add watchdog device to machine devices
Add the watchdog timer to the list of devices the Osiris registers at startup. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2440/mach-osiris.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 4525bb0f8513..64da36a00644 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -249,6 +249,7 @@ static struct platform_device osiris_pcmcia = {
static struct platform_device *osiris_devices[] __initdata = {
&s3c_device_i2c,
+ &s3c_device_wdt,
&s3c_device_nand,
&osiris_pcmcia,
};