summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c/include/plat
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-18 23:10:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-18 23:10:29 +0100
commit413427b5679f7bb9f25548c498ae92bb03e34443 (patch)
treeeae7e551852b85f4b746e1adfd69acd5b378e331 /arch/arm/plat-s3c/include/plat
parent187f81b3d8d315c35c73ac0d05b15a04a0ac3ce7 (diff)
parent9f01efaa49070acfcfa4b976345054cc27b172ed (diff)
downloadblackbird-op-linux-413427b5679f7bb9f25548c498ae92bb03e34443.tar.gz
blackbird-op-linux-413427b5679f7bb9f25548c498ae92bb03e34443.zip
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/plat-s3c/include/plat')
-rw-r--r--arch/arm/plat-s3c/include/plat/devs.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h
index a0b6768fddcf..b5b9c4d46e9a 100644
--- a/arch/arm/plat-s3c/include/plat/devs.h
+++ b/arch/arm/plat-s3c/include/plat/devs.h
@@ -24,13 +24,16 @@ extern struct platform_device *s3c24xx_uart_src[];
extern struct platform_device s3c_device_timer[];
+extern struct platform_device s3c64xx_device_iis0;
+extern struct platform_device s3c64xx_device_iis1;
+extern struct platform_device s3c64xx_device_iisv4;
+
extern struct platform_device s3c_device_fb;
extern struct platform_device s3c_device_usb;
extern struct platform_device s3c_device_lcd;
extern struct platform_device s3c_device_wdt;
extern struct platform_device s3c_device_i2c0;
extern struct platform_device s3c_device_i2c1;
-extern struct platform_device s3c_device_iis;
extern struct platform_device s3c_device_rtc;
extern struct platform_device s3c_device_adc;
extern struct platform_device s3c_device_sdi;
OpenPOWER on IntegriCloud