From 4c8e681f83e46d180a8446607cc44a00e6db90d4 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Fri, 22 Jul 2011 22:19:12 +0000
Subject: [PATCH] --- yaml --- r: 258559 b: refs/heads/master c:
 4fa5ee31b4fd109536aa5745d8c6af7c3bfd6d3b h: refs/heads/master i:   258557:
 09577b0eab2c7d5769556f028893e808f7d33e43   258555:
 96ac9340272cfb1e51387c479768bdc391954095   258551:
 3a0138722671d108527e19ccc6100cacc6ec41ad   258543:
 d1d344ff1cdf96d6ad30bb2927d8f66e9c1226bd   258527:
 057bfb970e4063943173b659547193ca24e2f7c0   258495:
 afa884cf93535ef837ca576f9e7ea47251e0d00b   258431:
 8b804a15672f45386e7f68fac5414c2eb83079dd   258303:
 1cd06c0eda9ddf00f4dd263debe5d06b5e163c0c   258047:
 cc12fc21ea0e9e4af159d57a9799e312f230a2ee v: v3

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

diff --git a/[refs] b/[refs]
index d5ccf0cf59af..ca2f0409ab6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9035cd498486d5a82ad8ae9bcfdb91b3e57ec9d
+refs/heads/master: 4fa5ee31b4fd109536aa5745d8c6af7c3bfd6d3b
diff --git a/trunk/drivers/net/bna/bnad.c b/trunk/drivers/net/bna/bnad.c
index 00273e5b70bf..8e35b2596f93 100644
--- a/trunk/drivers/net/bna/bnad.c
+++ b/trunk/drivers/net/bna/bnad.c
@@ -25,7 +25,6 @@
 #include <linux/if_ether.h>
 #include <linux/ip.h>
 #include <linux/prefetch.h>
-#include <linux/if_vlan.h>
 
 #include "bnad.h"
 #include "bna.h"