Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index 5a29397ca4b6f1633e91b8b94cfdac14f2071ff9..fe748a86d452030b8d44fcb7731c1badeb93c33c 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3091,7 +3091,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)
 {
 }