From b74d01bf4ddd1d262dcbb80c89d12de1344391fc Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 20 Apr 2009 21:53:33 +0900 Subject: [PATCH] --- yaml --- r: 146679 b: refs/heads/master c: cf242007a1eb29dcf93d1cb34713ec9b3f4a0e1b h: refs/heads/master i: 146677: d99ec9242b877d0f2d4035f04d0a1a985938fd02 146675: d1598859acebdd44e1b86551217ad871cc2bf64d 146671: eb0674a9e7716cff505b7200d8e0336747f4c439 v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/Kconfig | 4 ---- trunk/arch/sh/drivers/pci/Makefile | 2 +- trunk/arch/sh/drivers/pci/{pci-new.c => pci.c} | 0 4 files changed, 2 insertions(+), 6 deletions(-) rename trunk/arch/sh/drivers/pci/{pci-new.c => pci.c} (100%) 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