diff -urN kernel26/arch/arm/mach-pxa/Kconfig kernel26.1/arch/arm/mach-pxa/Kconfig
--- kernel26/arch/arm/mach-pxa/Kconfig	2004-04-01 17:55:53.000000000 -0700
+++ kernel26.1/arch/arm/mach-pxa/Kconfig	2004-04-10 23:34:07.650242168 -0600
@@ -40,7 +40,7 @@
 	bool "hp iPAQ h3900"
 	depends on ARCH_PXA
 
-config ARCH_H4000
+config MACH_H4000
         bool "hp iPAQ h4000"
         depends on ARCH_PXA
 
diff -urN kernel26/arch/arm/mach-pxa/Makefile kernel26.1/arch/arm/mach-pxa/Makefile
--- kernel26/arch/arm/mach-pxa/Makefile	2004-04-01 17:55:53.000000000 -0700
+++ kernel26.1/arch/arm/mach-pxa/Makefile	2004-04-10 23:33:51.683669456 -0600
@@ -20,7 +20,7 @@
 
 obj-$(CONFIG_ARCH_H1900)	+= h1900.o
 obj-$(CONFIG_ARCH_H3900)	+= h3900.o
-obj-$(CONFIG_ARCH_H4000)        += h4000.o
+obj-$(CONFIG_MACH_H4000)        += h4000.o
 obj-$(CONFIG_ARCH_H5400)	+= h5400.o
 obj-$(CONFIG_ARCH_H2200)	+= h2200.o
 obj-$(CONFIG_H2200_PCMCIA) 	+= h2200_pcmcia.o