---

yaml --- r: 231530 b: refs/heads/master c: fc8fe1e h: refs/heads/master v: v3
git-mirror · Jan 16, 2011 · 50f8d5d · 50f8d5d
1 parent af733ce
commit 50f8d5d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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