From ba9e49cd7a8589563ac72c79973c43edab1bd32c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 18 Feb 2008 16:40:10 -0800
Subject: [PATCH] --- yaml --- r: 85868 b: refs/heads/master c:
 8c5b4a3f43c060662d83574a4c85fbb362419ddd h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/sparc64/kernel/pci.c | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 678728d837f7..cabcb0339d49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667bc389c716389795c6cfa145ab5ef6279fbb62
+refs/heads/master: 8c5b4a3f43c060662d83574a4c85fbb362419ddd
diff --git a/trunk/arch/sparc64/kernel/pci.c b/trunk/arch/sparc64/kernel/pci.c
index a61c38fe75ea..545356b00e2e 100644
--- a/trunk/arch/sparc64/kernel/pci.c
+++ b/trunk/arch/sparc64/kernel/pci.c
@@ -225,20 +225,6 @@ static int __init pci_controller_init(const char *model_name, int namelen, struc
 	return 0;
 }
 
-static int __init pci_is_controller(const char *model_name, int namelen, struct device_node *dp)
-{
-	int i;
-
-	for (i = 0; i < PCI_NUM_CONTROLLER_TYPES; i++) {
-		if (!strncmp(model_name,
-			     pci_controller_table[i].model_name,
-			     namelen)) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
 static int __init pci_controller_scan(int (*handler)(const char *, int, struct device_node *))
 {
 	struct device_node *dp;
@@ -273,13 +259,6 @@ static int __init pci_controller_scan(int (*handler)(const char *, int, struct d
 	return count;
 }
 
-
-/* Is there some PCI controller in the system?  */
-int __init pcic_present(void)
-{
-	return pci_controller_scan(pci_is_controller);
-}
-
 /* Find each controller in the system, attach and initialize
  * software state structure for each and link into the
  * pci_pbm_root.  Setup the controller enough such