git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /repos/git/net-next-2.6
[pandora-kernel.git]
/
include
/
linux
/
pci-acpi.h
diff --git
a/include/linux/pci-acpi.h
b/include/linux/pci-acpi.h
index
479d9bb
..
4462350
100644
(file)
--- a/
include/linux/pci-acpi.h
+++ b/
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