From 8083e6d8bb6d8e1fd92e8367f4aae57953ad5ea6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 15 Aug 2008 19:46:01 -0700
Subject: [PATCH] --- yaml --- r: 108810 b: refs/heads/master c:
 08013fa353fdcfc0a03cae805393abfc56722387 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0da1b16e23d8..43d34103e038 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f42157cb568c1eb02eca7df4da67553a9edae24a
+refs/heads/master: 08013fa353fdcfc0a03cae805393abfc56722387
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index d4548101e495..2486a656f12d 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -35,8 +35,8 @@
 #include <linux/time.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #include <linux/if_vlan.h>
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define BCM_VLAN 1
 #endif
 #include <net/ip.h>