diff --git a/[refs] b/[refs] index 1b2b15af2c4d..f5a166906893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96daa8cd53945a1220d2b2f4a44bc57f0cc46760 +refs/heads/master: fe58fc8f40257948c2f9fc5a56863077ce3138f0 diff --git a/trunk/arch/x86/kernel/Makefile_64 b/trunk/arch/x86/kernel/Makefile_64 index b41e838dc788..19af64e1a3fc 100644 --- a/trunk/arch/x86/kernel/Makefile_64 +++ b/trunk/arch/x86/kernel/Makefile_64 @@ -4,7 +4,6 @@ extra-y := head_64.o head64.o init_task.o vmlinux.lds CPPFLAGS_vmlinux.lds += -Ux86_64 -EXTRA_AFLAGS := -traditional obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \