diff --git a/[refs] b/[refs]
index 4e4bbe7e3ddf..4d2d0444e7ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9961079348d43dddb1f21118c17f054f63bbaa05
+refs/heads/master: 115e8a288252ef748f34f8b7c1115c563d702eda
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index b6ee424245dd..392eb3defbcd 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -2947,7 +2947,6 @@ void module_layout(struct module *mod,
 		   struct modversion_info *ver,
 		   struct kernel_param *kp,
 		   struct kernel_symbol *ks,
-		   struct marker *marker,
 		   struct tracepoint *tp)
 {
 }