From 285b3afbc15349034e74ada0d3e4d113bbcf22ca Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 20 Jul 2011 04:54:04 +0000
Subject: [PATCH] --- yaml --- r: 256548 b: refs/heads/master c:
 f605234066852b11096ab071124e3fe415e94420 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/if_vlan.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6724bf9cb777..81ce75ad2021 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 033b1142f4bd44a116d1356fe4a0510437ceddf9
+refs/heads/master: f605234066852b11096ab071124e3fe415e94420
diff --git a/trunk/include/linux/if_vlan.h b/trunk/include/linux/if_vlan.h
index bc03e40fd7fd..cfb0cf2230a9 100644
--- a/trunk/include/linux/if_vlan.h
+++ b/trunk/include/linux/if_vlan.h
@@ -135,12 +135,6 @@ vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
 	       unsigned int vlan_tci);
 
 #else
-static inline struct net_device *vlan_find_dev(struct net_device *real_dev,
-					       u16 vlan_id)
-{
-	return NULL;
-}
-
 static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
 {
 	BUG();