aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/mach-bast.c
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 13:20:49 +0000
commitb6a175a562a1c8d326de0ee501114a2af2602772 (patch)
tree10805d0ceace199e630c55e27342948342c97971 /arch/arm/mach-s3c2410/mach-bast.c
parent0953612a479491b57db794580b13a8e39b810724 (diff)
downloadkernel_samsung_aries-b6a175a562a1c8d326de0ee501114a2af2602772.zip
kernel_samsung_aries-b6a175a562a1c8d326de0ee501114a2af2602772.tar.gz
kernel_samsung_aries-b6a175a562a1c8d326de0ee501114a2af2602772.tar.bz2
[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/mach-bast.c')
-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 53c2a13..6617547 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,