summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-18 13:49:29 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-18 13:49:29 +0100
commita090b22f3fafa9340f903834de87552b50c5f2ba (patch)
treed07b55c9d60d585f8ceed2c8f43e8a04309fc67e /include/linux/acpi.h
parent0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff)
parentb43e1065cab4b5be90c016b2f076086b70cd1556 (diff)
downloadlinux-stable-a090b22f3fafa9340f903834de87552b50c5f2ba.tar.gz
linux-stable-a090b22f3fafa9340f903834de87552b50c5f2ba.tar.bz2
linux-stable-a090b22f3fafa9340f903834de87552b50c5f2ba.zip
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 8c1d6f2a2193..1e33ea00485a 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -74,9 +74,10 @@ enum acpi_address_range_id {
/* Table Handlers */
-typedef int (*acpi_table_handler) (struct acpi_table_header *table);
+typedef int (*acpi_tbl_table_handler)(struct acpi_table_header *table);
-typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+typedef int (*acpi_tbl_entry_handler)(struct acpi_subtable_header *header,
+ const unsigned long end);
#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
void acpi_initrd_override(void *data, size_t size);
@@ -95,10 +96,14 @@ int acpi_mps_check (void);
int acpi_numa_init (void);
int acpi_table_init (void);
-int acpi_table_parse (char *id, acpi_table_handler handler);
+int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
int __init acpi_table_parse_entries(char *id, unsigned long table_size,
- int entry_id, acpi_table_entry_handler handler, unsigned int max_entries);
-int acpi_table_parse_madt (enum acpi_madt_type id, acpi_table_entry_handler handler, unsigned int max_entries);
+ int entry_id,
+ acpi_tbl_entry_handler handler,
+ unsigned int max_entries);
+int acpi_table_parse_madt(enum acpi_madt_type id,
+ acpi_tbl_entry_handler handler,
+ unsigned int max_entries);
int acpi_parse_mcfg (struct acpi_table_header *header);
void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);