Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / acpi / acstruct.h

diff --git a/include/acpi/acstruct.h b/include/acpi/acstruct.h
index 5e8095f0f78f882ff62df22e6c75d587cdeb6a2f..88482655407f04fce85d9a35baa3ad8e1b17b624 100644 (file)
--- a/include/acpi/acstruct.h
+++ b/include/acpi/acstruct.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -139,13 +139,14 @@ struct acpi_init_walk_info {
        u16 buffer_init;
        u16 package_init;
        u16 object_count;
-       struct acpi_table_desc *table_desc;
+       acpi_owner_id owner_id;
+       acpi_native_uint table_index;
 };
 
 struct acpi_get_devices_info {
        acpi_walk_callback user_function;
        void *context;
-       char *hid;
+       const char *hid;
 };
 
 union acpi_aml_operands {