Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c
index 9731e8b47862..a8a8977d5887 100644
--- a/arch/mips/kernel/irq-rm7000.c
+++ b/arch/mips/kernel/irq-rm7000.c
@@ -18,23 +18,23 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 
-static inline void unmask_rm7k_irq(unsigned int irq)
+static inline void unmask_rm7k_irq(struct irq_data *d)
 {
-        set_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
+        set_c0_intcontrol(0x100 << (d->irq - RM7K_CPU_IRQ_BASE));
 }
 
-static inline void mask_rm7k_irq(unsigned int irq)
+static inline void mask_rm7k_irq(struct irq_data *d)
 {
-        clear_c0_intcontrol(0x100 << (irq - RM7K_CPU_IRQ_BASE));
+        clear_c0_intcontrol(0x100 << (d->irq - RM7K_CPU_IRQ_BASE));
 }
 
 static struct irq_chip rm7k_irq_controller = {
         .name = "RM7000",
-        .ack = mask_rm7k_irq,
-        .mask = mask_rm7k_irq,
-        .mask_ack = mask_rm7k_irq,
-        .unmask = unmask_rm7k_irq,
-        .eoi    = unmask_rm7k_irq
+        .irq_ack = mask_rm7k_irq,
+        .irq_mask = mask_rm7k_irq,
+        .irq_mask_ack = mask_rm7k_irq,
+        .irq_unmask = unmask_rm7k_irq,
+        .irq_eoi = unmask_rm7k_irq
 };
 
 void __init rm7k_cpu_irq_init(void)
@@ -45,6 +45,6 @@ void __init rm7k_cpu_irq_init(void)
         clear_c0_intcontrol(0x00000f00);                /* Mask all */
 
         for (i = base; i < base + 4; i++)
-                set_irq_chip_and_handler(i, &rm7k_irq_controller,
+                irq_set_chip_and_handler(i, &rm7k_irq_controller,
                                          handle_percpu_irq);
 }