projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
4b9de5d
)
Merge tag 'irq-fixes-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz...
author
Thomas Gleixner
<tglx@linutronix.de>
Thu, 9 Mar 2017 11:06:41 +0000
(12:06 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Thu, 9 Mar 2017 11:06:41 +0000
(12:06 +0100)
Pull irqchip/irqdomain updates for 4.11-rc2 from Marc Zyngier
- irqchip/crossbar: Some type tidying up
- irqchip/gicv3-its: Workaround for a Qualcomm erratum
- irqdomain: Compile for for systems that don't use CONFIG_IRQ_DOMAIN
Fixed up minor conflict in the crossbar driver.
drivers/irqchip/irq-crossbar.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/irqchip/irq-crossbar.c
b/drivers/irqchip/irq-crossbar.c
index 1070b7b959f2d1f60996492398aa2bb6ae0ac06c..f96601268f7194bb5aada8f0f07327f2871d1c76 100644
(file)
--- a/
drivers/irqchip/irq-crossbar.c
+++ b/
drivers/irqchip/irq-crossbar.c
@@
-198,8
+198,8
@@
static const struct irq_domain_ops crossbar_domain_ops = {
static int __init crossbar_of_init(struct device_node *node)
{
- int i, size, reserved = 0;
u32 max = 0, entry, reg_size;
+ int i, size, reserved = 0;
const __be32 *irqsr;
int ret = -ENOMEM;