[PATCH] CONFIG_ALPHA_PC164 compilation fix

From: Marc Zyngier (mzyngier@freesurf.fr)
Date: Fri Apr 04 2003 - 13:07:22 EST

Richard,

The included patch fixes 2.5.66 compilation with CONFIG_ALPHA_PC164
enabled.

Thanks,

        M.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1002 -> 1.1003
# arch/alpha/kernel/sys_cabriolet.c 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/04/03 maz@hina.wild-wind.fr.eu.org 1.1003
# Fix warning (and thus error, because of -Werror)
# when CONFIG_ALPHA_PC164 is defined.
# --------------------------------------------
#
diff -Nru a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
--- a/arch/alpha/kernel/sys_cabriolet.c Fri Apr 4 20:06:49 2003
+++ b/arch/alpha/kernel/sys_cabriolet.c Fri Apr 4 20:06:49 2003
@@ -132,11 +132,14 @@
         setup_irq(16+4, &isa_cascade_irqaction);
 }
 
+#ifndef CONFIG_ALPHA_PC164
+/* PC164 is the only case we don't want this to be defined */
 static void __init
 cabriolet_init_irq(void)
 {
         common_init_irq(srm_device_interrupt);
 }
+#endif
 
 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_PC164)
 /* In theory, the PC164 has the same interrupt hardware as the other 

-- 
Places change, faces change. Life is so very strange.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Apr 07 2003 - 22:00:23 EST