2 files changed, 5 insertions, 7 deletions

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 2cd57b4d64d9..fd2f9bf4dcc6 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -10,19 +10,16 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/compiler.h>
-
 struct tag;
 struct meminfo;
 struct sys_timer;
 
 struct machine_desc {
         /*
-         * Note! The first five elements are used
+         * Note! The first four elements are used
          * by assembler code in head-armv.S
          */
         unsigned int            nr;             /* architecture number  */
-        unsigned int __deprecated phys_ram;     /* start of physical ram */
         unsigned int            phys_io;        /* start of physical io */
         unsigned int            io_pg_offst;    /* byte offset for io 
                                                  * page tabe entry      */
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h
index 0ce6ca588d8c..d4d420ecf3a8 100644
--- a/include/asm-arm/mach/irq.h
+++ b/include/asm-arm/mach/irq.h
@@ -61,7 +61,7 @@ struct irqdesc {
         struct irqchip  *chip;
         struct irqaction *action;
         struct list_head pend;
-        void            *chipdata;
+        void __iomem    *base;
         void            *data;
         unsigned int    disable_depth;
 
@@ -74,6 +74,7 @@ struct irqdesc {
         unsigned int    noautoenable : 1;       /* don't automatically enable IRQ */
         unsigned int    unused   :25;
 
+        unsigned int    irqs_unhandled;
         struct proc_dir_entry *procdir;
 
 #ifdef CONFIG_SMP
@@ -113,8 +114,8 @@ void __set_irq_handler(unsigned int irq, irq_handler_t, int);
 #define set_irq_handler(irq,handler)            __set_irq_handler(irq,handler,0)
 #define set_irq_chained_handler(irq,handler)    __set_irq_handler(irq,handler,1)
 #define set_irq_data(irq,d)                     do { irq_desc[irq].data = d; } while (0)
-#define set_irq_chipdata(irq,d)                 do { irq_desc[irq].chipdata = d; } while (0)
-#define get_irq_chipdata(irq)                   (irq_desc[irq].chipdata)
+#define set_irq_chipdata(irq,d)                 do { irq_desc[irq].base = d; } while (0)
+#define get_irq_chipdata(irq)                   (irq_desc[irq].base)
 
 void set_irq_chip(unsigned int irq, struct irqchip *);
 void set_irq_flags(unsigned int irq, unsigned int flags);