git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_eiger.c
diff --git
a/arch/alpha/kernel/sys_eiger.c
b/arch/alpha/kernel/sys_eiger.c
index
baf60f3
..
b99ea48
100644
(file)
--- a/
arch/alpha/kernel/sys_eiger.c
+++ b/
arch/alpha/kernel/sys_eiger.c
@@
-80,7
+80,7
@@
eiger_end_irq(unsigned int irq)
eiger_enable_irq(irq);
}
eiger_enable_irq(irq);
}
-static struct
hw_interrupt_type
eiger_irq_type = {
+static struct
irq_chip
eiger_irq_type = {
.typename = "EIGER",
.startup = eiger_startup_irq,
.shutdown = eiger_disable_irq,
.typename = "EIGER",
.startup = eiger_startup_irq,
.shutdown = eiger_disable_irq,