--- linux-2.6.19.orig/arch/ppc/boot/simple/embed_config.c	2006-11-29 13:57:37.000000000 -0800
+++ linux-2.6.19/arch/ppc/boot/simple/embed_config.c	2006-12-01 21:29:59.000000000 -0800
@@ -867,11 +867,9 @@
 	   now, however the baud rates in ep405.h are for the internal
 	   clock. */
 	chcr0 = mfdcr(DCRN_CHCR0);
-	if ( (chcr0 & 0x1fff) != 0x103e ) {
-		mtdcr(DCRN_CHCR0, (chcr0 & 0xffffe000) | 0x103e);
+		mtdcr(DCRN_CHCR0, 0x10fe);
 		/* The following tricks serial_init() into resetting the baud rate */
 		writeb(0, UART0_IO_BASE + UART_LCR);
-	}
 
 	/* We haven't seen actual problems with the EP405 leaving the
 	 * EMAC running (as we have on Walnut).  But the registers
