projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into release
[linux-2.6-block.git]
/
drivers
/
pci
/
hotplug
/
pciehp.h
diff --git
a/drivers/pci/hotplug/pciehp.h
b/drivers/pci/hotplug/pciehp.h
index 27fd18f019f8e9d3447d8ce4a786de2b6a556095..db85284ffb621a98d93252f8c6d6069aa43fb006 100644
(file)
--- a/
drivers/pci/hotplug/pciehp.h
+++ b/
drivers/pci/hotplug/pciehp.h
@@
-217,7
+217,6
@@
struct hpc_ops {
#ifdef CONFIG_ACPI
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
-#include <acpi/actypes.h>
#include <linux/pci-acpi.h>
extern void __init pciehp_acpi_slot_detection_init(void);