diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-10-17 11:20:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-17 11:20:52 +0200 |
| commit | 52f4f324c727e77507ae0490b08fc92e140ba57d (patch) | |
| tree | c560a04a8c2025bf5e4a556d5ff0e86252a842db /include/linux/init.h | |
| parent | m32r: fix build due to notify_cpu_starting() change (diff) | |
| parent | {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 93538b696e3d..ad63824460e3 100644 --- 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 |