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 'master' into upstream
[pandora-kernel.git]
/
drivers
/
net
/
cxgb3
/
cxgb3_main.c
diff --git
a/drivers/net/cxgb3/cxgb3_main.c
b/drivers/net/cxgb3/cxgb3_main.c
index
c67f7d3
..
43583ed
100644
(file)
--- a/
drivers/net/cxgb3/cxgb3_main.c
+++ b/
drivers/net/cxgb3/cxgb3_main.c
@@
-757,7
+757,8
@@
static int cxgb_up(struct adapter *adap)
t3_intr_handler(adap,
adap->sge.qs[0].rspq.
polling),
- (adap->flags & USING_MSI) ? 0 : SA_SHIRQ,
+ (adap->flags & USING_MSI) ?
+ 0 : IRQF_SHARED,
adap->name, adap)))
goto irq_err;