Commit 8e3007a0 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King

[ARM] 4729/1: VR1000: 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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b6a175a5
...@@ -365,7 +365,6 @@ static struct platform_device *vr1000_devices[] __initdata = { ...@@ -365,7 +365,6 @@ static struct platform_device *vr1000_devices[] __initdata = {
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c, &s3c_device_i2c,
&s3c_device_iis,
&s3c_device_adc, &s3c_device_adc,
&serial_device, &serial_device,
&vr1000_nor, &vr1000_nor,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment