summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2.c
diff options
context:
space:
mode:
authorRussell King2014-04-04 01:33:49 +0200
committerRussell King2014-04-04 01:33:49 +0200
commitbce5669be3a8946952258a064ef26defeb887138 (patch)
tree117386b9909882c000f822011c5ea6fdcbab3273 /drivers/net/ethernet/broadcom/bnx2.c
parentMerge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst... (diff)
parentMerge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into... (diff)
downloadkernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.tar.gz
kernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.tar.xz
kernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.zip
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 9d2dedadf2df..cda25ac45b47 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -85,7 +85,7 @@ MODULE_FIRMWARE(FW_RV2P_FILE_09_Ax);
static int disable_msi = 0;
-module_param(disable_msi, int, 0);
+module_param(disable_msi, int, S_IRUGO);
MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
typedef enum {