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/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
irq_srm.c
diff --git
a/arch/alpha/kernel/irq_srm.c
b/arch/alpha/kernel/irq_srm.c
index
a03fbca
..
8522936
100644
(file)
--- a/
arch/alpha/kernel/irq_srm.c
+++ b/
arch/alpha/kernel/irq_srm.c
@@
-48,7
+48,7
@@
srm_end_irq(unsigned int irq)
}
/* Handle interrupts from the SRM, assuming no additional weirdness. */
-static struct
hw_interrupt_type
srm_irq_type = {
+static struct
irq_chip
srm_irq_type = {
.typename = "SRM",
.startup = srm_startup_irq,
.shutdown = srm_disable_irq,