diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 21:53:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 21:53:33 +0900 |
| commit | cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b (patch) | |
| tree | f325d1b36e5dc4c0aac2a50b68011e326a7b55ef /arch/sh/drivers | |
| parent | 35bcfffd86aac933205fbf8401e3e7e4dde68264 (diff) | |
| download | linux-3.10-cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b.tar.gz linux-3.10-cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b.tar.bz2 linux-3.10-cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b.zip | |
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>
Diffstat (limited to 'arch/sh/drivers')
| -rw-r--r-- | arch/sh/drivers/pci/Kconfig | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/Makefile | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/pci.c (renamed from arch/sh/drivers/pci/pci-new.c) | 0 |
3 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/drivers/pci/Kconfig b/arch/sh/drivers/pci/Kconfig index ea903a984f0..e8db585a663 100644 --- a/arch/sh/drivers/pci/Kconfig +++ b/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/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile index eacac7f475d..d2ffc477549 100644 --- a/arch/sh/drivers/pci/Makefile +++ b/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/arch/sh/drivers/pci/pci-new.c b/arch/sh/drivers/pci/pci.c index 54d77cbb8b3..54d77cbb8b3 100644 --- a/arch/sh/drivers/pci/pci-new.c +++ b/arch/sh/drivers/pci/pci.c |