From: Andrew Morton Signed-off-by: Andrew Morton --- Documentation/DocBook/Makefile | 2 +- arch/i386/kernel/Makefile | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) 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 @@ -22,6 +22,7 @@ obj-$(CONFIG_APM) += apm.o obj-$(CONFIG_X86_SMP) += smp.o smpboot.o tsc_sync.o obj-$(CONFIG_SMP) += smpcommon.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o +obj-$(CONFIG_KGDB) += kgdb.o kgdb-jmp.o obj-$(CONFIG_X86_MPPARSE) += mpparse.o obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o obj-$(CONFIG_X86_IO_APIC) += io_apic.o @@ -36,11 +37,7 @@ obj-y += sysenter.o vsyscall.o obj-$(CONFIG_ACPI_SRAT) += srat.o obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o -<<<<<<< HEAD/arch/i386/kernel/Makefile -======= obj-$(CONFIG_KGDB) += kgdb.o kgdb-jmp.o -obj-$(CONFIG_SERIAL_8250) += legacy_serial.o ->>>>>>> /arch/i386/kernel/Makefile obj-$(CONFIG_VM86) += vm86.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_HPET_TIMER) += hpet.o diff -puN drivers/serial/serial_core.c~git-kgdb-fixup drivers/serial/serial_core.c diff -puN Documentation/DocBook/Makefile~git-kgdb-fixup Documentation/DocBook/Makefile --- a/Documentation/DocBook/Makefile~git-kgdb-fixup +++ a/Documentation/DocBook/Makefile @@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mc procfs-guide.xml writing_usb_driver.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ - genericirq.xml s390-drivers.xml + genericirq.xml s390-drivers.xml kgdb.xml ### # The build process is as follows (targets): _