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: v3.5-rc1~11^2~8 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6fada59d4ca59b26600c60de8f4368c8f89961f;p=pandora-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 --- Reading git-diff-tree failed