diff --git a/[refs] b/[refs] index dc402e2516d4..8c1b6394cf12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54ce7f99065cadcbb627f47f2321b76f099fda28 +refs/heads/master: 0cecf92db84694cfed08329271e8ae6316e811eb diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 08b7561cd5a9..2ef0fbd3488f 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -19,7 +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) += setup_visws.o traps_visws.o apic_visws.o +obj-$(CONFIG_X86_VISWS) += visws_quirks.o traps_visws.o apic_visws.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 diff --git a/trunk/arch/x86/kernel/setup_visws.c b/trunk/arch/x86/kernel/visws_quirks.c similarity index 100% rename from trunk/arch/x86/kernel/setup_visws.c rename to trunk/arch/x86/kernel/visws_quirks.c