* [PATCH] sh: Fix build of sh7750 base boards
@ 2011-01-24 1:40 Nobuhiro Iwamatsu
2011-01-24 5:09 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Nobuhiro Iwamatsu @ 2011-01-24 1:40 UTC (permalink / raw)
To: linux-sh
Renamed platform_register_device to platform_device_register.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
index c2b0aaa..672944f 100644
--- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c
+++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c
@@ -230,10 +230,10 @@ static struct platform_device *sh7750_devices[] __initdata = {
static int __init sh7750_devices_setup(void)
{
if (mach_is_rts7751r2d()) {
- platform_register_device(&scif_device);
+ platform_device_register(&scif_device);
} else {
- platform_register_device(&sci_device);
- platform_register_device(&scif_device);
+ platform_device_register(&sci_device);
+ platform_device_register(&scif_device);
}
return platform_add_devices(sh7750_devices,
--
1.7.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sh: Fix build of sh7750 base boards
2011-01-24 1:40 [PATCH] sh: Fix build of sh7750 base boards Nobuhiro Iwamatsu
@ 2011-01-24 5:09 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2011-01-24 5:09 UTC (permalink / raw)
To: linux-sh
On Mon, Jan 24, 2011 at 10:40:17AM +0900, Nobuhiro Iwamatsu wrote:
> Renamed platform_register_device to platform_device_register.
>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
I suppose there had to be something out of that huge merge conflict that
was inadverently broken. Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-24 5:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-24 1:40 [PATCH] sh: Fix build of sh7750 base boards Nobuhiro Iwamatsu
2011-01-24 5:09 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).