X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fi386%2Fmach-es7000%2Fes7000plat.c;h=a9ab0644f4035fd6b6e8e16b5054e09e663d117b;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=3d0fc853516d196eb379149dd33c58ff236b9507;hpb=43bc926fffd92024b46cafaf7350d669ba9ca884;p=linux-2.6.git

diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index 3d0fc8535..a9ab0644f 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -51,6 +51,8 @@ struct mip_reg		*host_reg;
 int 			mip_port;
 unsigned long		mip_addr, host_addr;
 
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
+
 /*
  * GSI override for ES7000 platforms.
  */
@@ -74,6 +76,8 @@ es7000_rename_gsi(int ioapic, int gsi)
 	return gsi;
 }
 
+#endif	/* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
+
 void __init
 setup_unisys(void)
 {
@@ -156,7 +160,6 @@ parse_unisys_oem (char *oemptr)
 	return es7000_plat;
 }
 
-#ifdef CONFIG_ACPI
 int __init
 find_unisys_acpi_oem_table(unsigned long *oem_addr)
 {
@@ -209,7 +212,6 @@ find_unisys_acpi_oem_table(unsigned long *oem_addr)
 	}
 	return -1;
 }
-#endif
 
 static void
 es7000_spin(int n)