summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-28 16:35:24 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-28 16:35:24 +1100
commit6749c5507388f3fc3719f57a54b540ee83f6661a (patch)
treec069f990f86b020a14b50759d0c75475eedde186 /arch/i386/kernel/Makefile
parent2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff)
parent56ec6462af9cba56a04439154e5768672d6f390f (diff)
Merge ../powerpc-merge
Diffstat (limited to 'arch/i386/kernel/Makefile')
-rw-r--r--arch/i386/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 60c3f76dfca..53bb9a79e27 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
- quirks.o i8237.o
+ quirks.o i8237.o topology.o
obj-y += cpu/
obj-y += timers/