Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

[linux-2.6-omap-h63xx.git] / arch / ia64 / hp / sim / hpsim_irq.c

diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index 8145547bb52daf891199affd969a5dd9cb8cee9a..cc0a3182db3c0158d246f658065a0f0f5d426a5f 100644 (file)
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -22,12 +22,12 @@ hpsim_irq_noop (unsigned int irq)
 }
 
 static void
-hpsim_set_affinity_noop (unsigned int a, cpumask_t b)
+hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
 {
 }
 
 static struct hw_interrupt_type irq_type_hp_sim = {
-       .typename =     "hpsim",
+       .name =         "hpsim",
        .startup =      hpsim_irq_startup,
        .shutdown =     hpsim_irq_noop,
        .enable =       hpsim_irq_noop,