瀏覽代碼

sh: pci: Rename pci-new.c to pci.c.

pci-new.c is now in a state to replace the old pci.c, rename it
accordingly.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Paul Mundt 16 年之前
父節點
當前提交
cf242007a1
共有 3 個文件被更改,包括 1 次插入5 次删除
  1. 0 4
      arch/sh/drivers/pci/Kconfig
  2. 1 1
      arch/sh/drivers/pci/Makefile
  3. 0 0
      arch/sh/drivers/pci/pci.c

+ 0 - 4
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
 	  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
 	  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'.
 	  to see if you can say 'N' here. Otherwise, leave it as 'Y'.
-
-config PCI_NEW
-	def_bool y
-	depends on PCI

+ 1 - 1
arch/sh/drivers/pci/Makefile

@@ -1,7 +1,7 @@
 #
 #
 # Makefile for the PCI specific kernel interface routines under Linux.
 # 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_SH7751)	+= pci-sh7751.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751R)	+= pci-sh7751.o ops-sh4.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751R)	+= pci-sh7751.o ops-sh4.o

+ 0 - 0
arch/sh/drivers/pci/pci-new.c → arch/sh/drivers/pci/pci.c