From: Lee Jones Date: Thu, 17 May 2012 12:18:36 +0000 (+0100) Subject: ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots X-Git-Tag: upstream/snapshot3+hdmi~7305^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6fada59d4ca59b26600c60de8f4368c8f89961f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots The patch to disable SMSC911x registration was applied twice in the upstream kernel by mistake. Git interpreted this as 'take the same entry from a similar struct' which was close by. This was the wrong thing to do. This patch rectifies this error and re-enables SMSC911x registration when Device Tree is not enabled. Acked-by: Linus Walleij Signed-off-by: Lee Jones Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 57e89f6..c27a9b0 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -673,6 +673,7 @@ static void __init u8500_cryp1_hash1_init(struct device *parent) static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, + &snowball_sbnet_dev, &ab8500_device, };