1 files changed, 0 insertions, 46 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 91f1f2363870..b3e8a268f6d6 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -53,57 +53,11 @@ enum acpi_irq_model_id {
 extern enum acpi_irq_model_id   acpi_irq_model;
-/* Root System Description Pointer (RSDP) */
-struct acpi_table_rsdp {
-        char                    signature[8];
-        u8                      checksum;
-        char                    oem_id[6];
-        u8                      revision;
-        u32                     rsdt_address;
-} __attribute__ ((packed));
-struct acpi20_table_rsdp {
-        char                    signature[8];
-        u8                      checksum;
-        char                    oem_id[6];
-        u8                      revision;
-        u32                     rsdt_address;
-        u32                     length;
-        u64                     xsdt_address;
-        u8                      ext_checksum;
-        u8                      reserved[3];
-} __attribute__ ((packed));
 typedef struct {
        u8                      type;
        u8                      length;
 } __attribute__ ((packed)) acpi_table_entry_header;
-/* Root System Description Table (RSDT) */
-struct acpi_table_rsdt {
-        struct acpi_table_header header;
-        u32                     entry[8];
-} __attribute__ ((packed));
-/* Extended System Description Table (XSDT) */
-struct acpi_table_xsdt {
-        struct acpi_table_header header;
-        u64                     entry[1];
-} __attribute__ ((packed));
-/* Fixed ACPI Description Table (FADT) */
-struct acpi_table_fadt {
-        struct acpi_table_header header;
-        u32 facs_addr;
-        u32 dsdt_addr;
-        /* ... */
-} __attribute__ ((packed));
 /* Multiple APIC Description Table (MADT) */
 struct acpi_table_madt {

diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 91f1f2363870..b3e8a268f6d6 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h
@@ -53,57 +53,11 @@ enum acpi_irq_model_id {
53		53
54	extern enum acpi_irq_model_id acpi_irq_model;	54	extern enum acpi_irq_model_id acpi_irq_model;
55		55
56
57	/* Root System Description Pointer (RSDP) */
58
59	struct acpi_table_rsdp {
60	char signature[8];
61	u8 checksum;
62	char oem_id[6];
63	u8 revision;
64	u32 rsdt_address;
65	} __attribute__ ((packed));
66
67	struct acpi20_table_rsdp {
68	char signature[8];
69	u8 checksum;
70	char oem_id[6];
71	u8 revision;
72	u32 rsdt_address;
73	u32 length;
74	u64 xsdt_address;
75	u8 ext_checksum;
76	u8 reserved[3];
77	} __attribute__ ((packed));
78
79	typedef struct {	56	typedef struct {
80	u8 type;	57	u8 type;
81	u8 length;	58	u8 length;
82	} __attribute__ ((packed)) acpi_table_entry_header;	59	} __attribute__ ((packed)) acpi_table_entry_header;
83		60
84	/* Root System Description Table (RSDT) */
85
86	struct acpi_table_rsdt {
87	struct acpi_table_header header;
88	u32 entry[8];
89	} __attribute__ ((packed));
90
91	/* Extended System Description Table (XSDT) */
92
93	struct acpi_table_xsdt {
94	struct acpi_table_header header;
95	u64 entry[1];
96	} __attribute__ ((packed));
97
98	/* Fixed ACPI Description Table (FADT) */
99
100	struct acpi_table_fadt {
101	struct acpi_table_header header;
102	u32 facs_addr;
103	u32 dsdt_addr;
104	/* ... */
105	} __attribute__ ((packed));
106
107	/* Multiple APIC Description Table (MADT) */	61	/* Multiple APIC Description Table (MADT) */
108		62
109	struct acpi_table_madt {	63	struct acpi_table_madt {