* [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
@ 2007-01-02 22:45 grant.likely
2007-01-02 22:52 ` Sylvain Munaut
0 siblings, 1 reply; 2+ messages in thread
From: grant.likely @ 2007-01-02 22:45 UTC (permalink / raw)
To: tnt, paulus, linuxppc-dev
From: Grant Likely <grant.likely@secretlab.ca>
The mpc52xx_uart_of_enumerate() function was added when adding 52xx
support to arch/powerpc, but it must not be called for arch/ppc.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
Please include for .20; without this patch you cannot build an arch/ppc
kernel for the lite52xx.
drivers/serial/mpc52xx_uart.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 9d11a75..3c4b6c2 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -789,7 +789,9 @@ static struct console mpc52xx_console =
static int __init
mpc52xx_console_init(void)
{
+#if defined(CONFIG_PPC_MERGE)
mpc52xx_uart_of_enumerate();
+#endif
register_console(&mpc52xx_console);
return 0;
}
--
1.4.3.rc2.g0503
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
2007-01-02 22:45 [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again grant.likely
@ 2007-01-02 22:52 ` Sylvain Munaut
0 siblings, 0 replies; 2+ messages in thread
From: Sylvain Munaut @ 2007-01-02 22:52 UTC (permalink / raw)
To: grant.likely; +Cc: linuxppc-dev, paulus
grant.likely@secretlab.ca wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
>
> The mpc52xx_uart_of_enumerate() function was added when adding 52xx
> support to arch/powerpc, but it must not be called for arch/ppc.
>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>
Acked-by: Sylvain Munaut <tnt@246tNt.com>
obvious compile fix.
> ---
>
> Please include for .20; without this patch you cannot build an arch/ppc
> kernel for the lite52xx.
>
> drivers/serial/mpc52xx_uart.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
> index 9d11a75..3c4b6c2 100644
> --- a/drivers/serial/mpc52xx_uart.c
> +++ b/drivers/serial/mpc52xx_uart.c
> @@ -789,7 +789,9 @@ static struct console mpc52xx_console =
> static int __init
> mpc52xx_console_init(void)
> {
> +#if defined(CONFIG_PPC_MERGE)
> mpc52xx_uart_of_enumerate();
> +#endif
> register_console(&mpc52xx_console);
> return 0;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-02 22:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-02 22:45 [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again grant.likely
2007-01-02 22:52 ` Sylvain Munaut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.