diff -urpN -X /home/fletch/.diff.exclude 890-16way_x440/arch/i386/Kconfig 891-early_printk_fix/arch/i386/Kconfig
--- 890-16way_x440/arch/i386/Kconfig	Wed Aug 13 20:51:55 2003
+++ 891-early_printk_fix/arch/i386/Kconfig	Wed Aug 13 21:05:43 2003
@@ -1409,7 +1409,7 @@ config MAGIC_SYSRQ
 	  keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
 	  unless you really know what this hack does.
 
-config EARLY_PRINTK
+config X86_EARLY_PRINTK
 	bool "Early console support"
 	default n
 	depends on DEBUG_KERNEL
diff -urpN -X /home/fletch/.diff.exclude 890-16way_x440/include/asm-i386/early_printk.h 891-early_printk_fix/include/asm-i386/early_printk.h
--- 890-16way_x440/include/asm-i386/early_printk.h	Wed Aug 13 20:25:53 2003
+++ 891-early_printk_fix/include/asm-i386/early_printk.h	Wed Aug 13 21:05:43 2003
@@ -1,5 +1,5 @@
-#ifndef __EARLY_PRINTK_H_I386_
-#define __EARLY_PRINTK_H_I386_
+#ifndef __X86_EARLY_PRINTK_H_I386_
+#define __X86_EARLY_PRINTK_H_I386_
 
 #define VGABASE  0xB8000
 #define SERIAL_BASES { 0x3f8, 0x2f8 }
diff -urpN -X /home/fletch/.diff.exclude 890-16way_x440/include/asm-x86_64/early_printk.h 891-early_printk_fix/include/asm-x86_64/early_printk.h
--- 890-16way_x440/include/asm-x86_64/early_printk.h	Wed Aug 13 20:25:53 2003
+++ 891-early_printk_fix/include/asm-x86_64/early_printk.h	Wed Aug 13 21:05:43 2003
@@ -1,5 +1,5 @@
-#ifndef __EARLY_PRINTK_H_X86_64_
-#define __EARLY_PRINTK_H_X86_64_
+#ifndef __X86_EARLY_PRINTK_H_X86_64_
+#define __X86_EARLY_PRINTK_H_X86_64_
 
 #define VGABASE	0xffffffff800b8000UL
 #define SERIAL_BASES { 0x3f8, 0x2f8 }
diff -urpN -X /home/fletch/.diff.exclude 890-16way_x440/include/linux/early_printk.h 891-early_printk_fix/include/linux/early_printk.h
--- 890-16way_x440/include/linux/early_printk.h	Wed Aug 13 20:25:53 2003
+++ 891-early_printk_fix/include/linux/early_printk.h	Wed Aug 13 21:05:43 2003
@@ -1,7 +1,7 @@
-#ifndef __EARLY_PRINTK_H_
-#define __EARLY_PRINTK_H_
+#ifndef __X86_EARLY_PRINTK_H_
+#define __X86_EARLY_PRINTK_H_
 
-#ifdef CONFIG_EARLY_PRINTK
+#ifdef CONFIG_X86_EARLY_PRINTK
 #include <linux/console.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff -urpN -X /home/fletch/.diff.exclude 890-16way_x440/kernel/Makefile 891-early_printk_fix/kernel/Makefile
--- 890-16way_x440/kernel/Makefile	Wed Aug 13 20:51:56 2003
+++ 891-early_printk_fix/kernel/Makefile	Wed Aug 13 21:05:43 2003
@@ -26,7 +26,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq.o
 obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
 obj-$(CONFIG_COMPAT) += compat.o
 obj-$(CONFIG_IKCONFIG) += configs.o
-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+obj-$(CONFIG_X86_EARLY_PRINTK) += early_printk.o
 
 # files to be removed upon make clean
 clean-files := ikconfig.h