projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
qla3xxx.c
diff --git
a/drivers/net/qla3xxx.c
b/drivers/net/qla3xxx.c
index 348b4f1367c90ffda7d1c1922b6b37962b1b73a4..f3f737b9124847e96a998ba4ac1d58ea94cb0c96 100644
(file)
--- a/
drivers/net/qla3xxx.c
+++ b/
drivers/net/qla3xxx.c
@@
-3468,7
+3468,7
@@
static int ql_adapter_up(struct ql3_adapter *qdev)
{
struct net_device *ndev = qdev->ndev;
int err;
- unsigned long irq_flags = IRQF_S
AMPLE_RANDOM | IRQF_S
HARED;
+ unsigned long irq_flags = IRQF_SHARED;
unsigned long hw_flags;
if (ql_alloc_mem_resources(qdev)) {