diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index fc18bc1..c6984b3 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -19,6 +19,7 @@
 subdirs-$(CONFIG_ARCH_X86_AMD64) += amd64
 
 libcbfs-y += rom_media.c
+depthcharge-y += pci.c
 depthcharge-y += sign_of_life.c
 depthcharge-y += util.S
 depthcharge-y += zeropage.c
diff --git a/src/libpayload/drivers/pci.c b/src/arch/x86/pci.c
similarity index 100%
rename from src/libpayload/drivers/pci.c
rename to src/arch/x86/pci.c
diff --git a/src/libpayload/Kconfig b/src/libpayload/Kconfig
index 5a5da24..4eceb5c 100644
--- a/src/libpayload/Kconfig
+++ b/src/libpayload/Kconfig
@@ -42,11 +42,6 @@
 
 menu "Drivers"
 
-config PCI
-	bool "Support for PCI devices"
-	depends on ARCH_X86 # for now
-	default y
-
 config USB
 	bool "USB Support"
 	default n
diff --git a/src/libpayload/drivers/Makefile.inc b/src/libpayload/drivers/Makefile.inc
index f7c287a..965d520 100644
--- a/src/libpayload/drivers/Makefile.inc
+++ b/src/libpayload/drivers/Makefile.inc
@@ -27,8 +27,6 @@
 ## SUCH DAMAGE.
 ##
 
-depthcharge-$(CONFIG_PCI) += pci.c
-
 # USB stack
 depthcharge-$(CONFIG_USB) += usb/usbinit.c
 depthcharge-$(CONFIG_USB) += usb/usb.c