Message ID | 1369645206-3682-3-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On Mon, May 27, 2013 at 06:00:06PM +0900, Simon Horman wrote: > From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a > typo in the platform device's name: used underscore instead of hyphen. Minor nit: if this has been merged, then including the SHA is useful too. -Olof
Hello. On 28-05-2013 8:00, Olof Johansson wrote: >> From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >> While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a >> typo in the platform device's name: used underscore instead of hyphen. > Minor nit: if this has been merged, then including the SHA is useful too. Yes, it has been merged in 3.10. Simon, can you do this without me reposting the patch? The defective commit's SHA1 ID is dace48d04dee46a3409d5e13cd98031522e46377. Note that there is analogous R8A7778 Ether fix, the SHA1 for its defective commit is 524219146a89aee5366326c225ccd71231419d89. > -Olof WBR, Sergei
On Thu, May 30, 2013 at 04:23:00PM +0400, Sergei Shtylyov wrote: > Hello. > > On 28-05-2013 8:00, Olof Johansson wrote: > > >>From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > >>While recasting the commit "ARM: shmobile: R8A7779: add Ether support", I made a > >>typo in the platform device's name: used underscore instead of hyphen. > > >Minor nit: if this has been merged, then including the SHA is useful too. > > Yes, it has been merged in 3.10. Simon, can you do this without > me reposting the patch? The defective commit's SHA1 ID is > dace48d04dee46a3409d5e13cd98031522e46377. > Note that there is analogous R8A7778 Ether fix, the SHA1 for its > defective commit is 524219146a89aee5366326c225ccd71231419d89. Thanks, I will fix up the commit messages.
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index b0b3948..c14a69b 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -443,7 +443,7 @@ void __init r8a7779_add_standard_devices(void) void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata) { - platform_device_register_resndata(&platform_bus, "sh_eth", -1, + platform_device_register_resndata(&platform_bus, "sh-eth", -1, ether_resources, ARRAY_SIZE(ether_resources), pdata, sizeof(*pdata));