ACPICA: Remove duplicate table manager

[sfrench/cifs-2.6.git] / arch / i386 / mach-es7000 / es7000.h

diff --git a/arch/i386/mach-es7000/es7000.h b/arch/i386/mach-es7000/es7000.h
index f1e3204f5deca799b82060afdfd0666eb13d20df..c8d5aa132fa078d9f21cd52d550432766f0e8aa6 100644 (file)
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/i386/mach-es7000/es7000.h
@@ -83,15 +83,7 @@ struct es7000_oem_table {
        struct psai psai;
 };
 
-struct acpi_table_sdt {
-       unsigned long pa;
-       unsigned long count;
-       struct {
-               unsigned long pa;
-               enum acpi_table_id id;
-               unsigned long size;
-       }       entry[50];
-};
+#ifdef CONFIG_ACPI
 
 struct oem_table {
        struct acpi_table_header Header;
@@ -99,6 +91,9 @@ struct oem_table {
        u32 OEMTableSize;
 };
 
+extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
+#endif
+
 struct mip_reg {
        unsigned long long off_0;
        unsigned long long off_8;
@@ -114,7 +109,6 @@ struct mip_reg {
 #define        MIP_FUNC(VALUE)         (VALUE & 0xff)
 
 extern int parse_unisys_oem (char *oemptr);
-extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
 extern void setup_unisys(void);
 extern int es7000_start_cpu(int cpu, unsigned long eip);
 extern void es7000_sw_apic(void);