Re: [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again

[Sylvain Munaut <tnt@246tNt.com>]

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;
>  }
>