summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Chubb2005-06-01 07:34:00 +0200
committerTony Luck2005-06-02 00:20:17 +0200
commitb655913bf364603d17ad770dc4fb80e60555a255 (patch)
tree6cd3a91f7c8f8269be419e1a48d06508323900e8 /arch
parentAutomatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/u... (diff)
downloadkernel-qcow2-linux-b655913bf364603d17ad770dc4fb80e60555a255.tar.gz
kernel-qcow2-linux-b655913bf364603d17ad770dc4fb80e60555a255.tar.xz
kernel-qcow2-linux-b655913bf364603d17ad770dc4fb80e60555a255.zip
[IA64] Cleanup compile warnings for ski config
The attached patch cleans up a compilation warning when ACPI is turned off (i.e., when compiling for the Ski simulator). Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kernel/mca.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 2c75741dcc66..736e328b5e61 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1103,8 +1103,6 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
return IRQ_HANDLED;
}
-#endif /* CONFIG_ACPI */
-
/*
* ia64_mca_cpe_poll
*
@@ -1122,6 +1120,8 @@ ia64_mca_cpe_poll (unsigned long dummy)
platform_send_ipi(first_cpu(cpu_online_map), IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
}
+#endif /* CONFIG_ACPI */
+
/*
* C portion of the OS INIT handler
*