diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-21 19:50:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-21 19:50:33 +0100 |
| commit | efd0bf97deeddd9ba53daabfc470a1399c6b0b2d (patch) | |
| tree | eec56da5fbc796bac7c67f1990a18f5e0a304059 /arch/powerpc/sysdev/ppc4xx_soc.c | |
| parent | team: replace kmalloc+memcpy by kmemdup (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.tar.xz linux-efd0bf97deeddd9ba53daabfc470a1399c6b0b2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.
The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.
Conflicts:
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'arch/powerpc/sysdev/ppc4xx_soc.c')
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c index d3d6ce3c33b4..0debcc31ad70 100644 --- a/arch/powerpc/sysdev/ppc4xx_soc.c +++ b/arch/powerpc/sysdev/ppc4xx_soc.c @@ -115,7 +115,7 @@ static int __init ppc4xx_l2c_probe(void) } /* Install error handler */ - if (request_irq(irq, l2c_error_handler, IRQF_DISABLED, "L2C", 0) < 0) { + if (request_irq(irq, l2c_error_handler, 0, "L2C", 0) < 0) { printk(KERN_ERR "Cannot install L2C error handler" ", cache is not enabled\n"); of_node_put(np); |