lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2010-07-27 21:01:35 -07:00
parent b8bc0421ab 5447080cfa
commit bb7e95c8fd
19 changed files with 147 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/s2io.h
View File

@ -65,7 +65,7 @@ static int debug_level = ERR_DBG;
/* DEBUG message print. */
#define DBG_PRINT(dbg_level, fmt, args...) do { \
if (dbg_level >= debug_level) \
if (dbg_level <= debug_level) \
pr_info(fmt, ##args); \
} while (0)