From: Lee Jones Date: Tue, 24 Apr 2012 09:54:25 +0000 (+0100) Subject: ARM: ux500: Disable SMSC911x platform code registration when DT is enabled X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f58546a17c5dc2255c40e4bc4287e06a93b5c9a0;p=linux-beck.git ARM: ux500: Disable SMSC911x platform code registration when DT is enabled Now the SCMC911x is correctly enabled in Device Tree, there is no need to continue registering it from platform code. In fact, if we continue doing so, the system will throw an error on boot. Signed-off-by: Lee Jones Signed-off-by: Linus Walleij --- diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index b885f271e04a..f8150155a442 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -605,7 +605,6 @@ static void __init mop500_uart_init(struct device *parent) static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, - &snowball_sbnet_dev, &ab8500_device, };