diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 21:22:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 21:22:18 +0200 |
| commit | 6c82a000a29b93541b5b7db597a083c069755cc9 (patch) | |
| tree | b9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6 /arch/x86/kernel/Makefile | |
| parent | 5b4d2386c23e5de553fce002892c7691a989b350 (diff) | |
| parent | 39415a440ecceb0a5bd3c23686f18f83bb8368c6 (diff) | |
| download | linux-6c82a000a29b93541b5b7db597a083c069755cc9.tar.gz linux-6c82a000a29b93541b5b7db597a083c069755cc9.tar.bz2 linux-6c82a000a29b93541b5b7db597a083c069755cc9.zip | |
Merge branch 'x86/generalize-visws' into x86/core
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4033d8dc745b..55ff016e9f69 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -19,6 +19,7 @@ obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o obj-y += traps_$(BITS).o irq_$(BITS).o obj-y += time_$(BITS).o ioport.o ldt.o obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o +obj-$(CONFIG_X86_VISWS) += visws_quirks.o obj-$(CONFIG_X86_32) += probe_roms_32.o obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |