From: Ben Dooks Date: Sun, 23 Dec 2007 02:09:35 +0000 (+0100) Subject: [ARM] 4728/1: BAST: Do not add IIS device on initialisation X-Git-Tag: v2.6.25-rc1~1175^2~2^9~23 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b6a175a562a1c8d326de0ee501114a2af2602772;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Russell King --- diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 53c2a1376e0..66175471fff 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,