Index: sys/amd64/conf/DEFAULTS
===================================================================
--- sys/amd64/conf/DEFAULTS
+++ sys/amd64/conf/DEFAULTS
@@ -5,6 +5,9 @@
 
 machine		amd64
 
+# common files stuff between i386 and amd64
+files		"../../conf/files.x86"
+
 # Bus support.
 device		isa
 
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64
+++ sys/conf/files.amd64
@@ -298,10 +298,6 @@
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/fdc/fdc.c			optional	fdc
-dev/fdc/fdc_acpi.c		optional	fdc
-dev/fdc/fdc_isa.c		optional	fdc isa
-dev/fdc/fdc_pccard.c		optional	fdc pccard
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
 dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
Index: sys/conf/files.i386
===================================================================
--- sys/conf/files.i386
+++ sys/conf/files.i386
@@ -208,10 +208,6 @@
 dev/fb/s3_pci.c			optional s3pci
 dev/fb/vesa.c			optional vga vesa
 dev/fb/vga.c			optional vga
-dev/fdc/fdc.c			optional fdc
-dev/fdc/fdc_acpi.c		optional fdc
-dev/fdc/fdc_isa.c		optional fdc isa
-dev/fdc/fdc_pccard.c		optional fdc pccard
 dev/fe/if_fe_isa.c		optional fe isa
 dev/glxiic/glxiic.c		optional glxiic
 dev/glxsb/glxsb.c		optional glxsb
Index: sys/conf/files.x86
===================================================================
--- /dev/null
+++ sys/conf/files.x86
@@ -0,0 +1,14 @@
+# This file tells config what files go into building a kernel,
+# files marked standard are always included.
+#
+# $FreeBSD$
+#
+# This file contains all the x86 devices and such that are
+# common between i386 and amd64, but aren't applicable to
+# any other architecture we support.
+#
+
+dev/fdc/fdc.c			optional	fdc
+dev/fdc/fdc_acpi.c		optional	fdc
+dev/fdc/fdc_isa.c		optional	fdc isa
+dev/fdc/fdc_pccard.c		optional	fdc pccard
Index: sys/i386/conf/DEFAULTS
===================================================================
--- sys/i386/conf/DEFAULTS
+++ sys/i386/conf/DEFAULTS
@@ -5,6 +5,9 @@
 
 machine		i386
 
+# common files stuff between i386 and amd64
+files		"../../conf/files.x86"
+
 # Bus support.
 device		isa
 options 	ISAPNP