diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-05-17 13:18:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-06-01 02:04:18 +0200 |
| commit | e6fada59d4ca59b26600c60de8f4368c8f89961f (patch) | |
| tree | 7d5d658a3bb525454a2fa432a86270216f94ad88 /arch/arm | |
| parent | ccf74f7677ff1cd0044b24335a968bf9e95990eb (diff) | |
| download | linux-stable-e6fada59d4ca59b26600c60de8f4368c8f89961f.tar.gz linux-stable-e6fada59d4ca59b26600c60de8f4368c8f89961f.tar.bz2 linux-stable-e6fada59d4ca59b26600c60de8f4368c8f89961f.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 57e89f60ae4b..c27a9b07bd50 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, }; |