OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b3a6f4
)
[POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
author
Grant Likely
<grant.likely@secretlab.ca>
Tue, 2 Jan 2007 22:45:37 +0000
(15:45 -0700)
committer
Paul Mackerras
<paulus@samba.org>
Tue, 9 Jan 2007 06:03:02 +0000
(17:03 +1100)
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>
drivers/serial/mpc52xx_uart.c
patch
|
blob
|
history
diff --git
a/drivers/serial/mpc52xx_uart.c
b/drivers/serial/mpc52xx_uart.c
index
9d11a75
..
3c4b6c2
100644
(file)
--- 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;
}