From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Tue, 22 May 2012 09:01:20 +0100 Subject: [PATCH 16/16] ARM: ux500: Re-enable SMSC911x platform code registration during non-DT boots In-Reply-To: References: <1337330355-17747-1-git-send-email-lee.jones@linaro.org> <1337330355-17747-17-git-send-email-lee.jones@linaro.org> Message-ID: <4FBB47D0.9020109@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 21/05/12 22:46, Linus Walleij wrote: > On Fri, May 18, 2012 at 10:39 AM, Lee Jones wrote: > >> 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 > > Acked-by: Linus Walleij > > This patch needs to go first, and into the -rc series. Do you want to take it? If not, how would you like me to take it forward? -- Lee Jones Linaro ST-Ericsson Landing Team Lead M: +44 77 88 633 515 Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog