git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
sys_rawhide.c
diff --git
a/arch/alpha/kernel/sys_rawhide.c
b/arch/alpha/kernel/sys_rawhide.c
index
05888a0
..
581d08c
100644
(file)
--- a/
arch/alpha/kernel/sys_rawhide.c
+++ b/
arch/alpha/kernel/sys_rawhide.c
@@
-134,7
+134,7
@@
static struct hw_interrupt_type rawhide_irq_type = {
};
static void
};
static void
-rawhide_srm_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+rawhide_srm_device_interrupt(unsigned long vector)
{
int irq;
{
int irq;
@@
-158,7
+158,7
@@
rawhide_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
/* Adjust by which hose it is from. */
irq -= ((irq + 16) >> 2) & 0x38;
/* Adjust by which hose it is from. */
irq -= ((irq + 16) >> 2) & 0x38;
- handle_irq(irq
, regs
);
+ handle_irq(irq);
}
static void __init
}
static void __init
@@
-180,7
+180,7
@@
rawhide_init_irq(void)
for (i = 16; i < 128; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
for (i = 16; i < 128; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].
handler
= &rawhide_irq_type;
+ irq_desc[i].
chip
= &rawhide_irq_type;
}
init_i8259a_irqs();
}
init_i8259a_irqs();