diff --git a/[refs] b/[refs] index d3db5f976cea..89f58f0c4397 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17ed48040d9e8b6ae35bc492015bf0fe1c8bae4 +refs/heads/master: c4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index b01c7b1ac1ba..28c4f3f2e97d 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -36,7 +36,6 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o ldt.o dumpstack.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.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 diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile index 99e95b32ae7d..e629d7a428cb 100644 --- a/trunk/arch/x86/platform/Makefile +++ b/trunk/arch/x86/platform/Makefile @@ -1,3 +1,4 @@ # Platform specific code goes here obj-y += efi/ obj-y += sfi/ +obj-y += visws/ diff --git a/trunk/arch/x86/platform/visws/Makefile b/trunk/arch/x86/platform/visws/Makefile new file mode 100644 index 000000000000..91bc17ab2fd5 --- /dev/null +++ b/trunk/arch/x86/platform/visws/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_X86_VISWS) += visws_quirks.o diff --git a/trunk/arch/x86/kernel/visws_quirks.c b/trunk/arch/x86/platform/visws/visws_quirks.c similarity index 100% rename from trunk/arch/x86/kernel/visws_quirks.c rename to trunk/arch/x86/platform/visws/visws_quirks.c