diff --git a/[refs] b/[refs] index 9677fab2ff1b..f581ea63fa47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d0c9ec6dd7204e5895260d83a90c5a0d64143f7 +refs/heads/master: e6505ca668b2c21c06abb7bb96a8272a6f83411f diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index ce02b64bb261..d50ba296437c 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -6,7 +6,7 @@ extra-y := head.o head64.o init_task_64.o vmlinux.lds EXTRA_AFLAGS := -traditional obj-y := process.o signal_64.o entry.o traps_64.o irq_64.o \ ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \ - x8664_ksyms.o i387_64.o syscall.o vsyscall_64.o \ + x8664_ksyms_64.o i387_64.o syscall.o vsyscall_64.o \ setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet_64.o tsc.o bugs_64.o \ perfctr-watchdog.o diff --git a/trunk/arch/x86_64/kernel/x8664_ksyms.c b/trunk/arch/x86_64/kernel/x8664_ksyms_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/x8664_ksyms.c rename to trunk/arch/x86_64/kernel/x8664_ksyms_64.c