From 542a3f97567bffc4538fbf4a74a0b99bfcdda6a8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 25 Aug 2008 16:21:08 -0700
Subject: [PATCH] --- yaml --- r: 112991 b: refs/heads/master c:
 783c98b911fce8d47aa2906468ca39d44d46d7ce h: refs/heads/master i:   112989:
 eb6b8d864632fea9c99b97e883d5cd34d2f21999   112987:
 cac466edd5c3780aa37ef6b4765bb1caa6cf290a   112983:
 07d9e40e4d03b7ee46161899826689bfeadd3aff   112975:
 56a81e9205b112314be9b0198580331e5c42de9e   112959:
 77f0a3c0156da470e2c8285c4ea4604cd6736aa9 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/sparc64/kernel/Makefile |  4 ++--
 trunk/arch/sparc64/kernel/pci.c    | 18 ------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 3d923e673d29..e5504a3db353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85269eb5542b425b99d79dc4c312dce0157eac7e
+refs/heads/master: 783c98b911fce8d47aa2906468ca39d44d46d7ce
diff --git a/trunk/arch/sparc64/kernel/Makefile b/trunk/arch/sparc64/kernel/Makefile
index 313735fa5f2c..360a348e5bbb 100644
--- a/trunk/arch/sparc64/kernel/Makefile
+++ b/trunk/arch/sparc64/kernel/Makefile
@@ -10,13 +10,13 @@ extra-y		:= head.o init_task.o vmlinux.lds
 obj-y		:= process.o setup.o cpu.o idprom.o \
 		   traps.o auxio.o una_asm.o sysfs.o iommu.o \
 		   irq.o ptrace.o time.o sys_sparc.o signal.o \
-		   unaligned.o central.o pci.o starfire.o \
+		   unaligned.o central.o starfire.o \
 		   power.o sbus.o sparc64_ksyms.o \
 		   visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o
 
 obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
-obj-$(CONFIG_PCI)	 += ebus.o pci_common.o \
+obj-$(CONFIG_PCI)	 += ebus.o pci.o pci_common.o \
 			    pci_psycho.o pci_sabre.o pci_schizo.o \
 			    pci_sun4v.o pci_sun4v_asm.o pci_fire.o
 obj-$(CONFIG_PCI_MSI)	+= pci_msi.o
diff --git a/trunk/arch/sparc64/kernel/pci.c b/trunk/arch/sparc64/kernel/pci.c
index 55096195458f..9bb4b8cbcacb 100644
--- a/trunk/arch/sparc64/kernel/pci.c
+++ b/trunk/arch/sparc64/kernel/pci.c
@@ -28,22 +28,6 @@
 
 #include "pci_impl.h"
 
-#ifndef CONFIG_PCI
-/* A "nop" PCI implementation. */
-asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,
-				  unsigned long off, unsigned long len,
-				  unsigned char *buf)
-{
-	return 0;
-}
-asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn,
-				   unsigned long off, unsigned long len,
-				   unsigned char *buf)
-{
-	return 0;
-}
-#else
-
 /* List of all PCI controllers found in the system. */
 struct pci_pbm_info *pci_pbm_root = NULL;
 
@@ -1215,5 +1199,3 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
 	*start = rp->start - offset;
 	*end = rp->end - offset;
 }
-
-#endif /* !(CONFIG_PCI) */