diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-25 08:10:36 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-25 08:10:36 +0200 |
| commit | aca209e5e654951a3a90f5aaa8e04e0c470993b4 (patch) | |
| tree | 5de472175d8edcbdf7a98022af7bf650bde761e9 /include/acpi/acpiosxf.h | |
| parent | Linux 2.6.36 (diff) | |
| parent | Subject: [PATCH] ACPICA: Fix Scope() op in module level code (diff) | |
| download | linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.tar.xz linux-aca209e5e654951a3a90f5aaa8e04e0c470993b4.zip | |
Merge branch 'acpica' into release
Conflicts:
drivers/acpi/acpica/aclocal.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpiosxf.h')
| -rw-r--r-- | include/acpi/acpiosxf.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 29bf945143e8..43027432a055 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -223,25 +223,15 @@ acpi_os_write_memory(acpi_physical_address address, u32 value, u32 width); */ acpi_status acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id, - u32 reg, u32 *value, u32 width); + u32 reg, u64 *value, u32 width); acpi_status acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id, u32 reg, u64 value, u32 width); /* - * Interim function needed for PCI IRQ routing - */ -void -acpi_os_derive_pci_id(acpi_handle device, - acpi_handle region, struct acpi_pci_id **pci_id); - -/* * Miscellaneous */ -acpi_status acpi_os_validate_interface(char *interface); -acpi_status acpi_osi_invalidate(char* interface); - acpi_status acpi_os_validate_address(u8 space_id, acpi_physical_address address, acpi_size length, char *name); |