[ARM] 4729/1: VR1000: Do not add IIS device on initialisation
authorBen Dooks <ben-linux@fluff.org>
Sun, 23 Dec 2007 02:09:36 +0000 (03:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 28 Jan 2008 13:20:49 +0000 (13:20 +0000)
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>
arch/arm/mach-s3c2410/mach-vr1000.c

index 9f43f3f124f561eeec3efa9b5bbc16a9c083b5e1..3aade7b78fe5929a4deddb621f858b424336d8af 100644 (file)
@@ -365,7 +365,6 @@ static struct platform_device *vr1000_devices[] __initdata = {
        &s3c_device_lcd,
        &s3c_device_wdt,
        &s3c_device_i2c,
-       &s3c_device_iis,
        &s3c_device_adc,
        &serial_device,
        &vr1000_nor,