---

yaml --- r: 65469 b: refs/heads/master c: 2cf08fa h: refs/heads/master i: 65467: c995b60 v: v3
git-mirror · Oct 11, 2007 · 8763109 · 8763109
1 parent ac931a6
commit 8763109
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21a44007745783d8997ed115852a42fb2613bf9a
+refs/heads/master: 2cf08fa82161bf398c1a6321d738a45730b0acd2
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile
@@ -5,7 +5,7 @@
 extra-y 	:= head.o head64.o init_task.o vmlinux.lds
 EXTRA_AFLAGS	:= -traditional
 obj-y	:= process.o signal.o entry.o traps_64.o irq.o \
-		ptrace.o time.o ioport.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
+		ptrace.o time.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
 		x8664_ksyms.o i387.o syscall.o vsyscall_64.o \
 		setup64.o bootflag.o e820_64.o reboot.o quirks.o i8237.o \
 		pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \

diff --git a/trunk/arch/x86_64/kernel/ioport.c → trunk/arch/x86_64/kernel/ioport_64.c b/trunk/arch/x86_64/kernel/ioport.c → trunk/arch/x86_64/kernel/ioport_64.c