ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots
authorLee Jones <lee.jones@linaro.org>
Thu, 17 May 2012 12:18:36 +0000 (13:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 1 Jun 2012 00:04:18 +0000 (02:04 +0200)
commite6fada59d4ca59b26600c60de8f4368c8f89961f
tree7d5d658a3bb525454a2fa432a86270216f94ad88
parentccf74f7677ff1cd0044b24335a968bf9e95990eb
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 <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-ux500/board-mop500.c