diff --git a/[refs] b/[refs]
index 8f42f09dc6a7..154558c6e005 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01be5d63fd4645eab1d05a7caa04462c11c8b7a1
+refs/heads/master: 7693465d81827107caf9c447b9ad91098a1c4941
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index e5ee3b159e50..1481df2cb2e3 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -811,7 +811,13 @@ config MAPLE
 	 Dreamcast with a serial line terminal or a remote network
 	 connection.
 
-source "arch/sh/drivers/pci/Kconfig"
+config PCI
+	bool "PCI support"
+	depends on SYS_SUPPORTS_PCI
+	help
+	  Find out whether you have a PCI motherboard. PCI is the name of a
+	  bus system, i.e. the way the CPU talks to the other stuff inside
+	  your box. If you have PCI, say Y, otherwise N.
 
 source "drivers/pci/pcie/Kconfig"
 
diff --git a/trunk/arch/sh/drivers/pci/Kconfig b/trunk/arch/sh/drivers/pci/Kconfig
deleted file mode 100644
index 78a3ce1e6c4d..000000000000
--- a/trunk/arch/sh/drivers/pci/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-config PCI
-	bool "PCI support"
-	depends on SYS_SUPPORTS_PCI
-	help
-	  Find out whether you have a PCI motherboard. PCI is the name of a
-	  bus system, i.e. the way the CPU talks to the other stuff inside
-	  your box. If you have PCI, say Y, otherwise N.