diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
| commit | 88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch) | |
| tree | ab518773c0ff4606f1a57d00b5931332a7e1d96e /arch/i386/kernel/Makefile | |
| parent | fa4fa40a990f8f4eff65476bef32007c154bbac0 (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
| download | lwn-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.tar.gz lwn-88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/Makefile')
| -rw-r--r-- | arch/i386/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 65656c033d70..5b9ed21216cf 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 topology.o + quirks.o i8237.o topology.o alternative.o obj-y += cpu/ obj-y += timers/ |