x86: rodata config hookup

[sfrench/cifs-2.6.git] / arch / x86 / kernel / Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index b40bed4baa77075491d103f4fdd49783b063b059..6f813009d44b348de25cbb355a197f9c8f1241fe 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -10,13 +10,13 @@ CFLAGS_vsyscall_64.o := $(PROFILING) -g0
 
 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_$(BITS).o ldt.o
+obj-y                  += time_$(BITS).o ioport.o ldt.o
 obj-y                  += setup_$(BITS).o i8259_$(BITS).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
 obj-$(CONFIG_X86_64)   += syscall_64.o vsyscall_64.o setup64.o
 obj-y                  += pci-dma_$(BITS).o  bootflag.o e820_$(BITS).o
-obj-y                  += quirks.o i8237.o topology.o
+obj-y                  += quirks.o i8237.o topology.o kdebugfs.o
 obj-y                  += alternative.o i8253.o
 obj-$(CONFIG_X86_64)   += pci-nommu_64.o bugs_64.o
 obj-y                  += tsc_$(BITS).o io_delay.o rtc.o
@@ -64,10 +64,15 @@ obj-$(CONFIG_HPET_TIMER)    += hpet.o
 
 obj-$(CONFIG_K8_NB)            += k8.o
 obj-$(CONFIG_MGEODE_LX)                += geode_32.o mfgpt_32.o
+obj-$(CONFIG_DEBUG_RODATA_TEST)        += test_rodata.o
+obj-$(CONFIG_DEBUG_NX_TEST)    += test_nx.o
 
 obj-$(CONFIG_VMI)              += vmi_32.o vmiclock_32.o
 obj-$(CONFIG_PARAVIRT)         += paravirt.o paravirt_patch_$(BITS).o
+
+ifdef CONFIG_INPUT_PCSPKR
 obj-y                          += pcspeaker.o
+endif
 
 obj-$(CONFIG_SCx200)           += scx200_32.o