From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Jul 2011 06:23:37 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.1-rc1~316^2~224
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4;p=thirdparty%2Fkernel%2Flinux.git

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

e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4
diff --cc drivers/net/bnx2x/bnx2x_main.c
index 98604350a811b,74be989f51c5f..5b4a8f34b13c3
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@@ -50,7 -49,9 +50,8 @@@
  #include <linux/zlib.h>
  #include <linux/io.h>
  #include <linux/stringify.h>
+ #include <linux/vmalloc.h>
  
 -#define BNX2X_MAIN
  #include "bnx2x.h"
  #include "bnx2x_init.h"
  #include "bnx2x_init_ops.h"