diff --git a/[refs] b/[refs]
index 409f9e28d163..dac0544b3bf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8f1641b5829629d3af8e52750ba3b542f8f56c8
+refs/heads/master: 83bd1b793e1e6b68be4f7b18752de9620137dfa2
diff --git a/trunk/net/ethernet/Makefile b/trunk/net/ethernet/Makefile
index 7cef1d8ace27..323177505404 100644
--- a/trunk/net/ethernet/Makefile
+++ b/trunk/net/ethernet/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y					+= eth.o
-obj-$(subst m,y,$(CONFIG_IPX))		+= pe2.o
-obj-$(subst m,y,$(CONFIG_ATALK))	+= pe2.o
diff --git a/trunk/net/ipx/Makefile b/trunk/net/ipx/Makefile
index 4b95e3ea0f8b..440fafa9fd07 100644
--- a/trunk/net/ipx/Makefile
+++ b/trunk/net/ipx/Makefile
@@ -4,5 +4,5 @@
 
 obj-$(CONFIG_IPX) += ipx.o
 
-ipx-y			:= af_ipx.o ipx_route.o ipx_proc.o
+ipx-y			:= af_ipx.o ipx_route.o ipx_proc.o pe2.o
 ipx-$(CONFIG_SYSCTL)	+= sysctl_net_ipx.o
diff --git a/trunk/net/ethernet/pe2.c b/trunk/net/ipx/pe2.c
similarity index 91%
rename from trunk/net/ethernet/pe2.c
rename to trunk/net/ipx/pe2.c
index 85d574addbc1..32dcd601ab32 100644
--- a/trunk/net/ethernet/pe2.c
+++ b/trunk/net/ipx/pe2.c
@@ -28,10 +28,8 @@ struct datalink_proto *make_EII_client(void)
 
 	return proto;
 }
-EXPORT_SYMBOL(make_EII_client);
 
 void destroy_EII_client(struct datalink_proto *dl)
 {
 	kfree(dl);
 }
-EXPORT_SYMBOL(destroy_EII_client);