patch to avoid declaring irq_desc on ia64

patch to avoid declaring irq_desc on ia64

[David Mosberger]

My understanding is that the big irq.c unification is still being
worked on.  Until that happens, would you mind accepting the attached
patch?  The CONFIG_IA64 is of course not ideal, but it will trivially
disappear once the unified irq.c work is in.

This change is, I believe, the last one that prevents ia64 from
compiling out of the box (apart from the show_stack() patches which
are already in Andrew's tree).

	--david

PS: Yes, I could work around the problem by changing the irq_desc()
    macro name to something else.  But that would be lot of wasted
    effort given that the unified irq.c will also be using a macro of
    the same name.

diff -Nru a/include/linux/irq.h b/include/linux/irq.h
--- a/include/linux/irq.h	Thu Jun 19 13:28:02 2003
+++ b/include/linux/irq.h	Thu Jun 19 13:28:02 2003
@@ -56,7 +56,7 @@
  *
  * Pad this out to 32 bytes for cache and indexing reasons.
  */
-typedef struct {
+typedef struct irq_desc {
 	unsigned int status;		/* IRQ status */
 	hw_irq_controller *handler;
 	struct irqaction *action;	/* IRQ action list */
@@ -66,7 +66,9 @@
 	spinlock_t lock;
 } ____cacheline_aligned irq_desc_t;
 
+#ifndef CONFIG_IA64
 extern irq_desc_t irq_desc [NR_IRQS];
+#endif
 
 #include <asm/hw_irq.h> /* the arch dependent stuff */