summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/achware.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-12-10 15:19:18 +0100
committerJiri Kosina <jkosina@suse.cz>2010-12-10 15:19:18 +0100
commit2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch)
tree63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/acpi/acpica/achware.h
parentHID: simplify an index check in hid_lookup_collection (diff)
parentMerge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes... (diff)
downloadlinux-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.xz
linux-2ade0c1d9d93b7642212657ef76f4a1e30233711.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/acpi/acpica/achware.h')
-rw-r--r--drivers/acpi/acpica/achware.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index 120b3af56596..167470ad2d21 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -121,6 +121,13 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
struct acpi_gpe_block_info *gpe_block,
void *context);
+/*
+ * hwpci - PCI configuration support
+ */
+acpi_status
+acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
+ acpi_handle root_pci_device, acpi_handle pci_region);
+
#ifdef ACPI_FUTURE_USAGE
/*
* hwtimer - ACPI Timer prototypes