diff -urN linux-2.6.13-rc3/arch/ppc/platforms/sandpoint.c linux-2.6.13-rc3-8241/arch/ppc/platforms/sandpoint.c
--- linux-2.6.13-rc3/arch/ppc/platforms/sandpoint.c	2005-07-13 12:46:46.000000000 +0800
+++ linux-2.6.13-rc3-8241/arch/ppc/platforms/sandpoint.c	2005-07-15 12:52:08.000000000 +0800
@@ -320,9 +320,8 @@
 
 			/* this disables the 2nd serial port on the DUART
 			 * since the sandpoint does not have it connected */
-			pdata[1].uartclk = 0;
-			pdata[1].irq = 0;
-			pdata[1].mapbase = 0;
+			pdata[1].uartclk = bp->bi_busfreq;
+			pdata[1].membase = ioremap(pdata[1].mapbase, 0x100);
 		}
 	}
 
diff -urN linux-2.6.13-rc3/arch/ppc/platforms/sandpoint.h linux-2.6.13-rc3-8241/arch/ppc/platforms/sandpoint.h
--- linux-2.6.13-rc3/arch/ppc/platforms/sandpoint.h	2005-07-13 12:46:46.000000000 +0800
+++ linux-2.6.13-rc3-8241/arch/ppc/platforms/sandpoint.h	2005-07-15 12:45:14.000000000 +0800
@@ -51,30 +51,13 @@
 /*
  * Serial defines.
  */
-#define SANDPOINT_SERIAL_0		0xfe0003f8
-#define SANDPOINT_SERIAL_1		0xfe0002f8
-
-#define RS_TABLE_SIZE  2
-
+#define RS_TABLE_SIZE  4
+                                                                                                                             
 /* Rate for the 1.8432 Mhz clock for the onboard serial chip */
-#define BASE_BAUD			( 1843200 / 16 )
-#define UART_CLK			1843200
-
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_AUTO_IRQ)
-#else
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF)
-#endif
-
-#define STD_SERIAL_PORT_DFNS \
-        { 0, BASE_BAUD, SANDPOINT_SERIAL_0, 4, STD_COM_FLAGS, /* ttyS0 */ \
-		iomem_base: (u8 *)SANDPOINT_SERIAL_0,			  \
-		io_type: SERIAL_IO_MEM },				  \
-        { 0, BASE_BAUD, SANDPOINT_SERIAL_1, 3, STD_COM_FLAGS, /* ttyS1 */ \
-		iomem_base: (u8 *)SANDPOINT_SERIAL_1,			  \
-		io_type: SERIAL_IO_MEM },
-
-#define SERIAL_PORT_DFNS \
-        STD_SERIAL_PORT_DFNS
+#define BASE_BAUD                       ( 100000000 / 16 ) /* 100Mhz speed, divided by 16
+                                                            * to make the output freqency */
+#define UART_CLK                        1843200
+                                                                                                                             
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST)
 
 #endif /* __PPC_PLATFORMS_SANDPOINT_H */
diff -urN linux-2.6.13-rc3/arch/ppc/syslib/mpc10x_common.c linux-2.6.13-rc3-8241/arch/ppc/syslib/mpc10x_common.c
--- linux-2.6.13-rc3/arch/ppc/syslib/mpc10x_common.c	2005-07-13 12:46:46.000000000 +0800
+++ linux-2.6.13-rc3-8241/arch/ppc/syslib/mpc10x_common.c	2005-07-15 12:50:39.000000000 +0800
@@ -41,10 +41,10 @@
 #else
 #define EPIC_IRQ_BASE 5
 #endif
-#define MPC10X_I2C_IRQ (EPIC_IRQ_BASE + NUM_8259_INTERRUPTS)
-#define MPC10X_DMA0_IRQ (EPIC_IRQ_BASE + 1 + NUM_8259_INTERRUPTS)
-#define MPC10X_DMA1_IRQ (EPIC_IRQ_BASE + 2 + NUM_8259_INTERRUPTS)
-#define MPC10X_UART0_IRQ (EPIC_IRQ_BASE + 4 + NUM_8259_INTERRUPTS)
+#define MPC10X_I2C_IRQ (EPIC_IRQ_BASE)
+#define MPC10X_DMA0_IRQ (EPIC_IRQ_BASE + 1)
+#define MPC10X_DMA1_IRQ (EPIC_IRQ_BASE + 2)
+#define MPC10X_UART0_IRQ (EPIC_IRQ_BASE + 4)
 #else
 #define MPC10X_I2C_IRQ -1
 #define MPC10X_DMA0_IRQ -1