Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[~andy/linux] / net / ethernet / Makefile

diff --git a/net/ethernet/Makefile b/net/ethernet/Makefile
index 7cef1d8ace2738145978eef5c1cbeae226656db0..3231775054040f96ec8416569bdf635c1b6178c0 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