summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-04-24 11:54:25 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-05-02 00:42:38 +0200
commitf58546a17c5dc2255c40e4bc4287e06a93b5c9a0 (patch)
tree2255f08aa9ed46aba007af72e5f750103bbdbf43
parentARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement (diff)
downloadlinux-f58546a17c5dc2255c40e4bc4287e06a93b5c9a0.tar.xz
linux-f58546a17c5dc2255c40e4bc4287e06a93b5c9a0.zip
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 <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c1
1 files changed, 0 insertions, 1 deletions
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,
};