vserver 1.9.3

[linux-2.6.git] / include / acpi / actbl.h

diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 55680ad..b380c23 100644 (file)
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -288,19 +288,6 @@ struct smart_battery_table
 };
 
 
-/*
- * High performance timer
- */
-struct hpet_table
-{
-       ACPI_TABLE_HEADER_DEF
-       u32                             hardware_id;
-       u32                             base_address [3];
-       u8                              hpet_number;
-       u16                             clock_tick;
-       u8                              attributes;
-};
-
 #pragma pack()
 
 
@@ -344,4 +331,20 @@ struct acpi_table_support
 #include "actbl2.h"   /* Acpi 2.0 table definitions */
 
 
+#pragma pack(1)
+/*
+ * High performance timer
+ */
+struct hpet_table
+{
+       ACPI_TABLE_HEADER_DEF
+       u32                             hardware_id;
+       struct acpi_generic_address     base_address;
+       u8                              hpet_number;
+       u16                             clock_tick;
+       u8                              attributes;
+};
+
+#pragma pack()
+
 #endif /* __ACTBL_H__ */