aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 03:41:08 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 03:41:08 -0500
commitec9f168fcc344d2ffec1c8c822076bf22dab5c33 (patch)
treec7978abf4bba0a2718cd0f9c0c0efe93d734d226 /include/linux/acpi.h
parentb2576e1d4408e134e2188c967b1f28af39cd79d4 (diff)
parent087da3b4e2d7d3ef70a4fa649b9a286fdeb0e44e (diff)
Merge branch 'simplify_PRT' into release
Conflicts: drivers/acpi/pci_irq.c Note that this merge disables e1d3a90846b40ad3160bf4b648d36c6badad39ac pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index dfa0a5356c53..6fce2fc2d124 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -131,22 +131,6 @@ extern int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity);
131 */ 131 */
132void acpi_unregister_gsi (u32 gsi); 132void acpi_unregister_gsi (u32 gsi);
133 133
134struct acpi_prt_entry {
135 struct list_head node;
136 struct acpi_pci_id id;
137 u8 pin;
138 struct {
139 acpi_handle handle;
140 u32 index;
141 } link;
142 u32 irq;
143};
144
145struct acpi_prt_list {
146 int count;
147 struct list_head entries;
148};
149
150struct pci_dev; 134struct pci_dev;
151 135
152int acpi_pci_irq_enable (struct pci_dev *dev); 136int acpi_pci_irq_enable (struct pci_dev *dev);