[PATCH] myri10ge build fix

[linux-2.6] / include / acpi / amlresrc.h

diff --git a/include/acpi/amlresrc.h b/include/acpi/amlresrc.h
index 103aff07db18fcec617dbdea48a5a71faa08c503..fb4735315ad3e977ff008fd56f988de2fc8ba7d8 100644 (file)
--- a/include/acpi/amlresrc.h
+++ b/include/acpi/amlresrc.h
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,6 +92,11 @@ struct asl_resource_node {
        struct asl_resource_node *next;
 };
 
+/* Macros used to generate AML resource length fields */
+
+#define ACPI_AML_SIZE_LARGE(r)      (sizeof (r) - sizeof (struct aml_resource_large_header))
+#define ACPI_AML_SIZE_SMALL(r)      (sizeof (r) - sizeof (struct aml_resource_small_header))
+
 /*
  * Resource descriptors defined in the ACPI specification.
  *
@@ -134,7 +139,7 @@ struct aml_resource_end_dependent {
 AML_RESOURCE_SMALL_HEADER_COMMON};
 
 struct aml_resource_io {
-       AML_RESOURCE_SMALL_HEADER_COMMON u8 information;
+       AML_RESOURCE_SMALL_HEADER_COMMON u8 flags;
        u16 minimum;
        u16 maximum;
        u8 alignment;
@@ -164,7 +169,7 @@ struct aml_resource_large_header {
 AML_RESOURCE_LARGE_HEADER_COMMON};
 
 struct aml_resource_memory24 {
-       AML_RESOURCE_LARGE_HEADER_COMMON u8 information;
+       AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
        u16 minimum;
        u16 maximum;
        u16 alignment;
@@ -175,7 +180,7 @@ struct aml_resource_vendor_large {
 AML_RESOURCE_LARGE_HEADER_COMMON};
 
 struct aml_resource_memory32 {
-       AML_RESOURCE_LARGE_HEADER_COMMON u8 information;
+       AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
        u32 minimum;
        u32 maximum;
        u32 alignment;
@@ -183,7 +188,7 @@ struct aml_resource_memory32 {
 };
 
 struct aml_resource_fixed_memory32 {
-       AML_RESOURCE_LARGE_HEADER_COMMON u8 information;
+       AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
        u32 address;
        u32 address_length;
 };
@@ -205,7 +210,7 @@ struct aml_resource_extended_address64 {
        u64 maximum;
        u64 translation_offset;
        u64 address_length;
-       u64 type_specific_attributes;
+       u64 type_specific;
 };
 
 #define AML_RESOURCE_EXTENDED_ADDRESS_REVISION          1      /* ACPI 3.0 */
@@ -239,8 +244,8 @@ struct aml_resource_address16 {
 
 struct aml_resource_extended_irq {
        AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;
-       u8 table_length;
-       u32 interrupt_number[1];
+       u8 interrupt_count;
+       u32 interrupts[1];
        /* res_source_index, res_source optional fields follow */
 };