1 files changed, 17 insertions, 15 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 1734358..181c597 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -131,13 +131,6 @@ amd64/amd64/tsc.c		standard
 amd64/amd64/uio_machdep.c	standard
 amd64/amd64/uma_machdep.c	standard
 amd64/amd64/vm_machdep.c	standard
-amd64/isa/atpic.c		optional	atpic isa
-#amd64/isa/atpic_vector.S	optional	atpic isa
-amd64/isa/clock.c		standard
-amd64/isa/elcr.c		standard
-amd64/isa/isa.c			standard
-amd64/isa/isa_dma.c		standard
-amd64/isa/nmi.c			standard
 amd64/pci/pci_bus.c		optional	pci
 amd64/pci/pci_cfgreg.c		optional	pci
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
@@ -228,8 +221,6 @@ dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvtb.c		optional	sc
 dev/uart/uart_cpu_amd64.c	optional	uart
 dev/wpi/if_wpi.c		optional	wpi
-isa/atrtc.c			standard
-isa/orm.c			optional	isa
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/link_elf_obj.c		standard
@@ -289,12 +280,6 @@ compat/ndis/subr_ntoskrnl.c	optional	ndisapi pci
 compat/ndis/subr_pe.c		optional	ndisapi pci
 compat/ndis/subr_usbd.c		optional	ndisapi pci
 compat/ndis/winx64_wrap.S	optional	ndisapi pci
-i386/bios/smbios.c		optional	smbios
-i386/bios/vpd.c			optional	vpd
-i386/cpufreq/powernow.c		optional	cpufreq
-i386/cpufreq/est.c		optional	cpufreq
-i386/cpufreq/hwpstate.c		optional	cpufreq
-i386/cpufreq/p4tcc.c		optional	cpufreq
 #
 libkern/memmove.c		standard
 libkern/memset.c		standard
@@ -303,3 +288,20 @@ libkern/memset.c		standard
 #
 compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
 contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
+#
+# x86 shared code between IA32, AMD64 and PC98 architectures
+#
+x86/bios/smbios.c		optional	smbios
+x86/bios/vpd.c			optional	vpd
+x86/cpufreq/powernow.c		optional	cpufreq
+x86/cpufreq/est.c		optional	cpufreq
+x86/cpufreq/hwpstate.c		optional	cpufreq
+x86/cpufreq/p4tcc.c		optional	cpufreq
+x86/isa/atpic.c			optional	atpic isa
+x86/isa/atrtc.c			optional	atpic
+x86/isa/clock.c			standard
+x86/isa/elcr.c			standard
+x86/isa/isa.c			standard
+x86/isa/isa_dma.c		standard
+x86/isa/nmi.c			standard
+x86/isa/orm.c			optional	isa