diff -urN -X ../dontdiff linux-2.6.10-rc2-p1-work3/include/asm-arm/arch-s3c2410/uncompress.h linux-2.6.10-rc2-p1-work4/include/asm-arm/arch-s3c2410/uncompress.h
--- linux-2.6.10-rc2-p1-work3/include/asm-arm/arch-s3c2410/uncompress.h	2004-11-15 11:12:08.000000000 +0000
+++ linux-2.6.10-rc2-p1-work4/include/asm-arm/arch-s3c2410/uncompress.h	2004-11-15 15:27:40.000000000 +0000
@@ -14,12 +14,13 @@
  *  08-Sep-2003 BJD  Moved to linux v2.6
  *  12-Mar-2004 BJD  Updated header protection
  *  12-Oct-2004 BJD  Take account of debug uart configuration
+ *  15-Nov-2004 BJD  Fixed uart configuration
 */
 
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H
 
-#include <config/debug/s3c2410/port.h>
+#include <linux/config.h>
 
 /* defines for UART registers */
 #include "asm/arch/regs-serial.h"
@@ -34,11 +35,7 @@
 /* how many bytes we allow into the FIFO at a time in FIFO mode */
 #define FIFO_MAX	 (14)
 
-#if 1
-#define uart_base S3C2410_PA_UART + (0x4000 * CONFIG_DEBUG_S3C2410_UART)
-#else
-static unsigned int uart_base = S3C2410_PA_UART;
-#endif
+#define uart_base S3C2410_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT)
 
 static __inline__ void
 uart_wr(unsigned int reg, unsigned int val)
diff -urN -X ../dontdiff linux-2.6.10-rc2-p1-work3/arch/arm/boot/compressed/head.S linux-2.6.10-rc2-p1-work4/arch/arm/boot/compressed/head.S
--- linux-2.6.10-rc2-p1-work3/arch/arm/boot/compressed/head.S	2004-11-15 11:11:54.000000000 +0000
+++ linux-2.6.10-rc2-p1-work4/arch/arm/boot/compressed/head.S	2004-11-15 15:34:34.000000000 +0000
@@ -118,10 +118,9 @@
 		str	\rb, [r3, #0]
 		.endm
 #elif defined(CONFIG_ARCH_S3C2410)
-#include <config/debug/s3c2410/port.h>
 			.macro loadsp, rb
 		mov	\rb, #0x50000000
-		add	\rb, \rb, #0x4000 * CONFIG_DEBUG_S3C2410_UART
+		add	\rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
 		.endm
 		.macro	writeb, rb
 		strb	\rb, [r3, #0x20]