diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-01-02 23:45:37 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 07:03:02 +0100 |
| commit | c98750c2eb07b0bf49db0630cb5017ede005ce14 (patch) | |
| tree | a7d8e2bde9950a7d94e45a616ab5f2939c62ea8e /drivers | |
| parent | [POWERPC] Don't include powerpc/sysdev/rom.o for arch/ppc builds (diff) | |
| download | linux-c98750c2eb07b0bf49db0630cb5017ede005ce14.tar.xz linux-c98750c2eb07b0bf49db0630cb5017ede005ce14.zip | |
[POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 9d11a75663e6..3c4b6c243712 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; } |