From: Andrew Morton <akpm@linux-foundation.org>


Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/arm/mach-ixp4xx/ixdp425-setup.c   |    3 ++-
 arch/i386/kernel/Makefile              |    1 +
 arch/mips/mips-boards/generic/Makefile |    1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff -puN arch/arm/mach-ixp4xx/ixdp425-setup.c~git-kgdb-fixup arch/arm/mach-ixp4xx/ixdp425-setup.c
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c~git-kgdb-fixup
+++ a/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -28,6 +28,7 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/flash.h>
+#include <asm/kgdb.h>
 #include <asm/delay.h>
 
 static struct flash_platform_data ixdp425_flash_data = {
@@ -262,7 +263,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP110
 	/* Maintainer: MontaVista Software, Inc. */
 	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,
 	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-	.map_io		= ixp4xx_map_io,
+	.map_io		= ixdp425_map_io,
 	.init_irq	= ixp4xx_init_irq,
 	.timer		= &ixp4xx_timer,
 	.boot_params	= 0x0100,
diff -puN arch/i386/kernel/Makefile~git-kgdb-fixup arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile~git-kgdb-fixup
+++ a/arch/i386/kernel/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_prin
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
 obj-$(CONFIG_K8_NB)		+= k8.o
 obj-$(CONFIG_STACK_UNWIND)	+= unwind.o
+obj-$(CONFIG_KGDB)		+= kgdb.o kgdb-jmp.o
 
 obj-$(CONFIG_VMI)		+= vmi.o vmiclock.o
 obj-$(CONFIG_PARAVIRT)		+= paravirt.o
diff -puN arch/mips/mips-boards/generic/Makefile~git-kgdb-fixup arch/mips/mips-boards/generic/Makefile
--- a/arch/mips/mips-boards/generic/Makefile~git-kgdb-fixup
+++ a/arch/mips/mips-boards/generic/Makefile
@@ -23,5 +23,4 @@ obj-y				:= reset.o display.o init.o mem
 
 obj-$(CONFIG_EARLY_PRINTK)	+= console.o
 obj-$(CONFIG_PCI)		+= pci.o
-obj-$(CONFIG_KGDB)		+= gdb_hook.o
 obj-$(CONFIG_SYSFS)		+= corecard-sysfs.o
_