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

[safe/jmp/linux-2.6] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 27f61f6..0c12646 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -233,9 +233,6 @@ struct obs_kernel_param {
                __attribute__((aligned((sizeof(long)))))        \
                = { __setup_str_##unique_id, fn, early }
 
-#define __setup_null_param(str, unique_id)                     \
-       __setup_param(str, unique_id, NULL, 0)
-
 #define __setup(str, fn)                                       \
        __setup_param(str, fn, fn, 0)
 
@@ -296,7 +293,6 @@ void __init parse_early_param(void);
        void cleanup_module(void) __attribute__((alias(#exitfn)));
 
 #define __setup_param(str, unique_id, fn)      /* nothing */
-#define __setup_null_param(str, unique_id)     /* nothing */
 #define __setup(str, func)                     /* nothing */
 #endif