From 8a704be7903fe0b15364feb2291b1af0b3368ffe Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 2 Aug 2010 22:45:49 -0700
Subject: [PATCH] --- yaml --- r: 204037 b: refs/heads/master c:
 a427615e0420f179eab801b929111abaadea2ed3 h: refs/heads/master i:   204035:
 98cec2f9a5a6f20b91fed44dbcd3b86b61f4aad8 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ceb6d5d50cec..b4aebcee759c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00dad5e479531e379aba7358600cc768725d4f1f
+refs/heads/master: a427615e0420f179eab801b929111abaadea2ed3
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 5d1282df2fe3..8c663dbf1d77 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -101,8 +101,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/stat.h>
-#include <linux/if_bridge.h>
-#include <linux/if_macvlan.h>
 #include <net/dst.h>
 #include <net/pkt_sched.h>
 #include <net/checksum.h>