From f957699b97dedd071b03db9c5db85d9196223617 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Fri, 22 Jul 2011 22:20:25 +0000
Subject: [PATCH] --- yaml --- r: 258562 b: refs/heads/master c:
 9413b314f4b3f02bda7d7a7d6e1cdfa5ad375e0e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16b5041b6489..84d2bd760258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b03754dcdabb52bcb14f8288ca51f9bea8eb44
+refs/heads/master: 9413b314f4b3f02bda7d7a7d6e1cdfa5ad375e0e
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index 743e3ec729c2..f07e96ec8843 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -36,7 +36,6 @@
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/skbuff.h>
-#include <linux/if_vlan.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>