---

yaml --- r: 7294 b: refs/heads/master c: 37548d5 h: refs/heads/master v: v3
git-mirror · Sep 6, 2005 · 6142f64 · 6142f64
1 parent 73e8a03
commit 6142f64
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb14c4d641b4e083fae7ce4a0e8a3973cecb7554
+refs/heads/master: 37548d58e5ce53dda609c5b35c0eb62d50d59675
diff --git a/trunk/arch/ppc64/kernel/maple_setup.c b/trunk/arch/ppc64/kernel/maple_setup.c
@@ -207,9 +207,6 @@ static void __init maple_init_early(void)
 		comport = (void *)ioremap(physport, 16);
 		udbg_init_uart(comport, default_speed);
 
-		ppc_md.udbg_putc = udbg_putc;
-		ppc_md.udbg_getc = udbg_getc;
-		ppc_md.udbg_getc_poll = udbg_getc_poll;
 		DBG("Hello World !\n");
 	}
 

diff --git a/trunk/arch/ppc64/kernel/pSeries_setup.c b/trunk/arch/ppc64/kernel/pSeries_setup.c
@@ -397,9 +397,6 @@ static void __init pSeries_init_early(void)
 		comport = (void *)ioremap(physport, 16);
 		udbg_init_uart(comport, default_speed);
 
-		ppc_md.udbg_putc = udbg_putc;
-		ppc_md.udbg_getc = udbg_getc;
-		ppc_md.udbg_getc_poll = udbg_getc_poll;
 		DBG("Hello World !\n");
 	}
 

diff --git a/trunk/arch/ppc64/kernel/udbg.c b/trunk/arch/ppc64/kernel/udbg.c
@@ -70,6 +70,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_putc;		/* set access methods */
+		ppc_md.udbg_getc = udbg_getc;
+		ppc_md.udbg_getc_poll = udbg_getc_poll;
 	}
 }