diff --git a/[refs] b/[refs]
index 0bb2b4e9596e..099d2e291ce1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f28b62890097cb8732581a80f0a47fd7649df7d
+refs/heads/master: cf71130d630d773ef1861adbd8a034d3ac806f3e
diff --git a/trunk/arch/parisc/Makefile b/trunk/arch/parisc/Makefile
index 01d95e2f0581..113e28206503 100644
--- a/trunk/arch/parisc/Makefile
+++ b/trunk/arch/parisc/Makefile
@@ -65,8 +65,10 @@ ifndef CONFIG_FUNCTION_TRACER
 endif
 
 # Use long jumps instead of long branches (needed if your linker fails to
-# link a too big vmlinux executable)
-cflags-$(CONFIG_MLONGCALLS)	+= -mlong-calls
+# link a too big vmlinux executable). Not enabled for building modules.
+ifdef CONFIG_MLONGCALLS
+KBUILD_CFLAGS_KERNEL += -mlong-calls
+endif
 
 # select which processor to optimise for
 cflags-$(CONFIG_PA7100)		+= -march=1.1 -mschedule=7100