From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:56:34 +0000 (+0000)
Subject: - sync fedora and vserver branches:  will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~141
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c710c55fdeeb1e6114ec762ef340121a68891d77;p=linux-2.6.git

- sync fedora and vserver branches:  will help future merges
---

diff --git a/net/core/dev.c b/net/core/dev.c
index f67f80ebc..25167d78e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -115,7 +115,6 @@
 #endif	/* CONFIG_NET_RADIO */
 #include <linux/vs_network.h>
 #include <asm/current.h>
-#include <linux/vs_network.h>
 
 /* This define, if set, will randomly drop a packet when congestion
  * is more than moderate.  It helps fairness in the multi-interface
@@ -3365,7 +3364,6 @@ EXPORT_SYMBOL(dev_remove_pack);
 EXPORT_SYMBOL(dev_set_allmulti);
 EXPORT_SYMBOL(dev_set_promiscuity);
 EXPORT_SYMBOL(dev_change_flags);
-EXPORT_SYMBOL(dev_change_name);
 EXPORT_SYMBOL(dev_set_mtu);
 EXPORT_SYMBOL(dev_set_mac_address);
 EXPORT_SYMBOL(free_netdev);