diff --git a/[refs] b/[refs]
index a99610a86ce8..9f26bf9581b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93684d3b8062d1cebdeaed398ec6d1f354cb41a9
+refs/heads/master: 0f558c333445a0181f33f9e6f996ce7cf008206a
diff --git a/trunk/Makefile b/trunk/Makefile
index a55a1e4e6cda..7a95f4f8ef14 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -137,7 +137,7 @@ objtree		:= $(CURDIR)
 src		:= $(srctree)
 obj		:= $(objtree)
 
-VPATH		:= $(srctree):$(KBUILD_EXTMOD)
+VPATH		:= $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
 
 export srctree objtree VPATH TOPDIR