diff --git a/[refs] b/[refs]
index ff273063ad64..713d553a6943 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6a03a12ecdbe0dd80a55f6df3b7206c5a403a49
+refs/heads/master: 6aebb64ad415c7d63ad4db5b401f960fe7b1d972
diff --git a/trunk/arch/xtensa/platforms/iss/Makefile b/trunk/arch/xtensa/platforms/iss/Makefile
index af96e314d71f..c61dd3961b17 100644
--- a/trunk/arch/xtensa/platforms/iss/Makefile
+++ b/trunk/arch/xtensa/platforms/iss/Makefile
@@ -4,5 +4,5 @@
 # "prom monitor" library routines under Linux.
 #
 
-obj-y			= io.o console.o setup.o network.o
-
+obj-y			= io.o console.o setup.o
+obj-$(CONFIG_NET)	+= network.o