aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-12-27 19:14:29 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-12-27 19:14:29 +0100
commit86ec248ac3250b7187f430fded42d43284313dd6 (patch)
tree92e041f238b7411dd6a0930f46c41dbd2bda4a9a /arch
parentbe00f07200a2e1357e629a5d79c6add33c4dbf30 (diff)
parenteb97ba7e3da8998565058aedd3d57c1859083271 (diff)
Merge branch 'gta02-machine-devices-2.6.32' into om-gta02-2.6.32
Conflicts: arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2442/mach-gta02.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c
index 6afd4bd2c68..1480881268c 100644
--- a/arch/arm/mach-s3c2442/mach-gta02.c
+++ b/arch/arm/mach-s3c2442/mach-gta02.c
@@ -1224,6 +1224,8 @@ static void __init gta02_machine_init(void)
/* Set the panic callback to make AUX LED blink at ~5Hz. */
panic_blink = gta02_panic_blink;
+ s3c_device_ts.name = "s3c2440-ts";
+
gta02_hijack_gpb();
gta02_request_gpios();