summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-12-23 03:09:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-28 14:20:49 +0100
commitb6a175a562a1c8d326de0ee501114a2af2602772 (patch)
tree10805d0ceace199e630c55e27342948342c97971 /arch/arm/mach-s3c2410
parent[ARM] 4727/1: S3C2412: Remove unused GPESLPCON (diff)
downloadlinux-b6a175a562a1c8d326de0ee501114a2af2602772.tar.xz
linux-b6a175a562a1c8d326de0ee501114a2af2602772.zip
[ARM] 4728/1: BAST: Do not add IIS device on initialisation
The IIS device is being registered by the Simtec Audio driver, and thus registering here causes an error due to device tree naming collision. 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/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 53c2a1376e07..66175471fff3 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -540,7 +540,6 @@ static struct platform_device *bast_devices[] __initdata = {
&s3c_device_lcd,
&s3c_device_wdt,
&s3c_device_i2c,
- &s3c_device_iis,
&s3c_device_rtc,
&s3c_device_nand,
&bast_device_nor,