]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 4728/1: BAST: Do not add IIS device on initialisation
authorBen Dooks <ben-linux@fluff.org>
Sun, 23 Dec 2007 02:09:35 +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-bast.c

index 53c2a1376e07a673f145fb240b43ad31f6b91e16..66175471fff30492ebf45e8a4518b20af5915344 100644 (file)
@@ -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,