aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-10-24 22:09:01 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-10-24 22:09:01 +0200
commit399e0854777c263dee8f5abcbe5749007e594ee5 (patch)
tree48be7e34e539ccc48e9e17e40682c6ed4bf742f1 /arch/arm/plat-s3c
parent7319a99ed3faebd022c4912884415c2ed087bce8 (diff)
parent36a5e8676f2d19482cd4d9837c12d24c58882f8a (diff)
Merge branch 's3c-touchscreen-2.6.31' into om-gta02-2.6.31
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/include/plat/devs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h
index 2e170827e0b..41773808040 100644
--- a/arch/arm/plat-s3c/include/plat/devs.h
+++ b/arch/arm/plat-s3c/include/plat/devs.h
@@ -51,6 +51,8 @@ extern struct platform_device s3c_device_nand;
extern struct platform_device s3c_device_usbgadget;
extern struct platform_device s3c_device_usb_hsotg;
+extern struct platform_device s3c_device_ts;
+
/* s3c2440 specific devices */
#ifdef CONFIG_CPU_S3C2440