diff --git a/[refs] b/[refs] index 05b92c2636be..85f1af915f07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24ac26d425c96659b12cf16de7cbfe3bcbd73f05 +refs/heads/master: d44b3be88ed58bb1bbbf7d70c533598b3dc3d870 diff --git a/trunk/arch/sparc64/kernel/isa.c b/trunk/arch/sparc64/kernel/isa.c index 6f16dee280a8..24c0dc34be31 100644 --- a/trunk/arch/sparc64/kernel/isa.c +++ b/trunk/arch/sparc64/kernel/isa.c @@ -75,7 +75,7 @@ static int __init isa_dev_get_irq_using_imap(struct sparc_isa_device *isa_dev, struct linux_prom_registers *reg) { struct linux_prom_ebus_intmap *imap; - struct linux_prom_ebus_intmap *imask; + struct linux_prom_ebus_intmask *imask; unsigned int hi, lo, irq; int i, len, n_imap;