projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2.c
b/drivers/net/ethernet/broadcom/bnx2.c
index
505ceaf
..
27f11a5
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2.c
+++ b/
drivers/net/ethernet/broadcom/bnx2.c
@@
-50,7
+50,7
@@
#include <linux/log2.h>
#include <linux/aer.h>
-#if
defined(CONFIG_CNIC) || defined(CONFIG_CNIC_MODULE
)
+#if
IS_ENABLED(CONFIG_CNIC
)
#define BCM_CNIC 1
#include "cnic_if.h"
#endif