diff --git a/[refs] b/[refs]
index 97f7371d0f05..e02f3a0910ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35bcfffd86aac933205fbf8401e3e7e4dde68264
+refs/heads/master: cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b
diff --git a/trunk/arch/sh/drivers/pci/Kconfig b/trunk/arch/sh/drivers/pci/Kconfig
index ea903a984f01..e8db585a6638 100644
--- a/trunk/arch/sh/drivers/pci/Kconfig
+++ b/trunk/arch/sh/drivers/pci/Kconfig
@@ -17,7 +17,3 @@ config SH_PCIDMA_NONCOHERENT
 	  code will not have to flush the CPU's caches. If you have a PCI host
 	  bridge integrated with your SH CPU, refer carefully to the chip specs
 	  to see if you can say 'N' here. Otherwise, leave it as 'Y'.
-
-config PCI_NEW
-	def_bool y
-	depends on PCI
diff --git a/trunk/arch/sh/drivers/pci/Makefile b/trunk/arch/sh/drivers/pci/Makefile
index eacac7f475d9..d2ffc477549a 100644
--- a/trunk/arch/sh/drivers/pci/Makefile
+++ b/trunk/arch/sh/drivers/pci/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the PCI specific kernel interface routines under Linux.
 #
-obj-$(CONFIG_PCI_NEW)			+= pci-new.o
+obj-y					+= pci.o
 
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)	+= pci-sh7751.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751R)	+= pci-sh7751.o ops-sh4.o
diff --git a/trunk/arch/sh/drivers/pci/pci-new.c b/trunk/arch/sh/drivers/pci/pci.c
similarity index 100%
rename from trunk/arch/sh/drivers/pci/pci-new.c
rename to trunk/arch/sh/drivers/pci/pci.c