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 branch 'linux-next' of git://git.infradead.org/ubifs-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
sys_sable.c
diff --git
a/arch/alpha/kernel/sys_sable.c
b/arch/alpha/kernel/sys_sable.c
index
9e26325
..
426eb69
100644
(file)
--- a/
arch/alpha/kernel/sys_sable.c
+++ b/
arch/alpha/kernel/sys_sable.c
@@
-501,7
+501,7
@@
sable_lynx_mask_and_ack_irq(unsigned int irq)
spin_unlock(&sable_lynx_irq_lock);
}
spin_unlock(&sable_lynx_irq_lock);
}
-static struct
hw_interrupt_type
sable_lynx_irq_type = {
+static struct
irq_chip
sable_lynx_irq_type = {
.typename = "SABLE/LYNX",
.startup = sable_lynx_startup_irq,
.shutdown = sable_lynx_disable_irq,
.typename = "SABLE/LYNX",
.startup = sable_lynx_startup_irq,
.shutdown = sable_lynx_disable_irq,