patch-2.4.26 linux-2.4.26/arch/ppc/kernel/ibm440gp_common.c

• Lines: 23
• Date: 2004-04-14 06:05:27.000000000 -0700
• Orig file: linux-2.4.25/arch/ppc/kernel/ibm440gp_common.c
• Orig date: 2003-11-28 10:26:19.000000000 -0800

diff -urN linux-2.4.25/arch/ppc/kernel/ibm440gp_common.c linux-2.4.26/arch/ppc/kernel/ibm440gp_common.c
@@ -25,7 +25,7 @@
 /*
  * Calculate 440GP clocks
  */
-void __init ibm440gp_get_clocks(struct ibm440gp_clocks* p, unsigned int sys_clk, 
+void __init ibm440gp_get_clocks(struct ibm44x_clocks* p, unsigned int sys_clk, 
 	unsigned int ser_clk)
 {
 	u32 cpc0_sys0 = mfdcr(DCRN_CPC0_SYS0);
@@ -68,11 +68,11 @@
     
 	if (cpc0_cr0 & 0x00400000){
 		/* External UART clock */
-		p->uart = ser_clk;
+		p->uart0 = p->uart1 = ser_clk;
 	}
 	else {
 		/* Internal UART clock */    
     		u32 uart_div = ((cpc0_cr0 >> 16) & 0x1f) + 1;
-		p->uart = p->plb / uart_div;
+		p->uart0 = p->uart1 = p->plb / uart_div;
 	}
 }