Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux...

[cascardo/linux.git] / net / ethernet / Makefile

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 7cef1d8..3231775 100644 (file)
--- a/net/ethernet/Makefile
+++ b/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