diff options
| author | Milton Miller <miltonm@bga.com> | 2005-09-06 11:56:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-06 16:07:36 +1000 |
| commit | c8f1c8be629ee34991fdba8bfe46a5c455393209 (patch) | |
| tree | 66f218e641e87a0ca9ade7601345229b6557761e /arch/ppc64/kernel/udbg_16550.c | |
| parent | 7f853352e79bf57c4ee279b7458ed0c072e2be76 (diff) | |
| download | blackbird-obmc-linux-c8f1c8be629ee34991fdba8bfe46a5c455393209.tar.gz blackbird-obmc-linux-c8f1c8be629ee34991fdba8bfe46a5c455393209.zip | |
[PATCH] ppc64: Take udbg out of ppc_md
Take udbg out of ppc_md. Allows us to not overwrite early udbg inits
when assigning ppc_md.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/udbg_16550.c')
| -rw-r--r-- | arch/ppc64/kernel/udbg_16550.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/udbg_16550.c b/arch/ppc64/kernel/udbg_16550.c index 46a23e34f7c9..ffe19dbecd97 100644 --- a/arch/ppc64/kernel/udbg_16550.c +++ b/arch/ppc64/kernel/udbg_16550.c @@ -99,9 +99,9 @@ void udbg_init_uart(void __iomem *comport, unsigned int speed) out_8(&udbg_comport->lcr, 0x03); /* 8 data, 1 stop, no parity */ out_8(&udbg_comport->mcr, 0x03); /* RTS/DTR */ out_8(&udbg_comport->fcr ,0x07); /* Clear & enable FIFOs */ - ppc_md.udbg_putc = udbg_550_putc; - ppc_md.udbg_getc = udbg_550_getc; - ppc_md.udbg_getc_poll = udbg_550_getc_poll; + udbg_putc = udbg_550_putc; + udbg_getc = udbg_550_getc; + udbg_getc_poll = udbg_550_getc_poll; } } @@ -121,8 +121,8 @@ void udbg_init_maple_realmode(void) { udbg_comport = (volatile struct NS16550 __iomem *)0xf40003f8; - ppc_md.udbg_putc = udbg_maple_real_putc; - ppc_md.udbg_getc = NULL; - ppc_md.udbg_getc_poll = NULL; + udbg_putc = udbg_maple_real_putc; + udbg_getc = NULL; + udbg_getc_poll = NULL; } #endif /* CONFIG_PPC_MAPLE */ |
