Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8e3007a0e8a0d2f5e3139cb9fe606c2a998b9ed3
Commit: 8e3007a0e8a0d2f5e3139cb9fe606c2a998b9ed3
Parent: b6a175a562a1c8d326de0ee501114a2af2602772
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 23 03:09:36 2007 +0100
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 13:20:49 2008 +0000
[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 <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
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 9f43f3f..3aade7b 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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
