From 50f8d5da4ed47e94efba9da6a929fb845df7559f Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sun, 16 Jan 2011 20:42:43 +0100
Subject: [PATCH] --- yaml --- r: 231530 b: refs/heads/master c:
 fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/pci-acpi.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9305bf3e555a..bc837595eb4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8206b925fb0eba3a11839419be118b09105d7b1
+refs/heads/master: fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff
diff --git a/trunk/include/linux/pci-acpi.h b/trunk/include/linux/pci-acpi.h
index 479d9bb88e11..44623500f419 100644
--- a/trunk/include/linux/pci-acpi.h
+++ b/trunk/include/linux/pci-acpi.h
@@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)
 	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),
 					      pbus->number);
 }
-#else
-static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
-{ return NULL; }
 #endif
 
 #ifdef CONFIG_ACPI_APEI