projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[cascardo/linux.git]
/
arch
/
mips
/
cavium-octeon
/
octeon-irq.c
diff --git
a/arch/mips/cavium-octeon/octeon-irq.c
b/arch/mips/cavium-octeon/octeon-irq.c
index
f26c3c6
..
0352bc8
100644
(file)
--- a/
arch/mips/cavium-octeon/octeon-irq.c
+++ b/
arch/mips/cavium-octeon/octeon-irq.c
@@
-2221,7
+2221,7
@@
static irqreturn_t octeon_irq_cib_handler(int my_irq, void *data)
if (irqd_get_trigger_type(irq_data) &
IRQ_TYPE_EDGE_BOTH)
cvmx_write_csr(host_data->raw_reg, 1ull << i);
- generic_handle_irq_desc(
irq,
desc);
+ generic_handle_irq_desc(desc);
}
}