- sync fedora and vserver branches: will help future merges

diff --git a/net/core/dev.c b/net/core/dev.c
index f67f80e..25167d7 100644 (file)
--- 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);