diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2007-12-23 03:09:36 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-01-28 13:20:49 +0000 |
| commit | 8e3007a0e8a0d2f5e3139cb9fe606c2a998b9ed3 (patch) | |
| tree | 452dceadcc90f9d976ac9202c4ea6119734bbb64 | |
| parent | [ARM] 4728/1: BAST: Do not add IIS device on initialisation (diff) | |
| download | linux-dev-8e3007a0e8a0d2f5e3139cb9fe606c2a998b9ed3.tar.xz linux-dev-8e3007a0e8a0d2f5e3139cb9fe606c2a998b9ed3.zip | |
[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: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-vr1000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c index 9f43f3f124f5..3aade7b78fe5 100644 --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c @@ -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, |