ES7000 broken build for non-ACPI config

diff -puN arch/i386/mach-es7000/es7000.h~build-fix-1 arch/i386/mach-es7000/es7000.h
@@ -74,6 +74,7 @@ struct es7000_oem_table {
 	struct psai psai;
 };
 
+#ifdef CONFIG_ACPI_BOOT
 struct acpi_table_sdt {
 	unsigned long pa;
 	unsigned long count;

@@ -89,6 +90,7 @@ struct oem_table {
 	u32 OEMTableAddr;
 	u32 OEMTableSize;
 };
+#endif
 
 struct mip_reg {
 	unsigned long long off_0;

diff -puN arch/i386/mach-es7000/es7000plat.c~build-fix-1 arch/i386/mach-es7000/es7000plat.c
@@ -51,8 +51,6 @@ struct mip_reg		*host_reg;
 int 			mip_port;
 unsigned long		mip_addr, host_addr;
 
-#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT))
-
 /*
  * GSI override for ES7000 platforms.
  */

@@ -73,8 +71,6 @@ es7000_rename_gsi(int ioapic, int gsi)
 	return gsi;
 }
 
-#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)
-
 /*
  * Parse the OEM Table
  */

@@ -156,6 +152,7 @@ parse_unisys_oem (char *oemptr, int oem_
 	return es7000_plat;
 }
 
+#ifdef CONFIG_ACPI_BOOT
 int __init
 find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length)
 {

@@ -210,6 +207,7 @@ find_unisys_acpi_oem_table(unsigned long
 	Dprintk("ES7000: did not find Unisys ACPI OEM table!\n");
 	return -1;
 }
+#endif
 
 static void
 es7000_spin(int n)

diff -puN include/asm-i386/mach-es7000/mach_mpparse.h~build-fix-1 include/asm-i386/mach-es7000/mach_mpparse.h
@@ -13,7 +13,9 @@ static inline void mpc_oem_pci_bus(struc
 }
 
 extern int parse_unisys_oem (char *oemptr, int oem_entries);
+#ifdef CONFIG_ACPI_BOOT
 extern int find_unisys_acpi_oem_table(unsigned long *oem_addr, int *length);
+#endif
 
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
 		char *productid)

@@ -30,10 +32,12 @@ static inline int mps_oem_check(struct m
 /* Hook from generic ACPI tables.c */
 static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
+#ifdef CONFIG_ACPI_BOOT
 	unsigned long oem_addr; 
 	int oem_entries;
 	if (!find_unisys_acpi_oem_table(&oem_addr, &oem_entries))
 		return parse_unisys_oem((char *)oem_addr, oem_entries);
+#endif
 	return 0;
 }
 

diff -puN arch/i386/kernel/mpparse.c~build-fix-1 arch/i386/kernel/mpparse.c
@@ -812,6 +812,8 @@ void __init find_smp_config (void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
+int es7000_plat;
+
 #ifdef CONFIG_ACPI_BOOT
 
 void __init mp_register_lapic_address (

@@ -982,8 +984,6 @@ void __init mp_override_legacy_irq (
 	return;
 }
 
-int es7000_plat;
-
 void __init mp_config_acpi_legacy_irqs (void)
 {
 	struct mpc_config_intsrc intsrc;