diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-05 04:32:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-05 04:33:55 -0400 |
| commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
| tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /kernel/configs.c | |
| parent | f629299b544b6cc12b4e3e85fec96f4ce5809482 (diff) | |
| parent | 140d0b2108faebc77c6523296e211e509cb9f5f9 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/configs.c')
| -rw-r--r-- | kernel/configs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/configs.c b/kernel/configs.c index b4066b44a99d..42e8fa075eed 100644 --- a/kernel/configs.c +++ b/kernel/configs.c | |||
| @@ -92,8 +92,8 @@ static void __exit ikconfig_cleanup(void) | |||
| 92 | module_init(ikconfig_init); | 92 | module_init(ikconfig_init); |
| 93 | module_exit(ikconfig_cleanup); | 93 | module_exit(ikconfig_cleanup); |
| 94 | 94 | ||
| 95 | #endif /* CONFIG_IKCONFIG_PROC */ | ||
| 96 | |||
| 95 | MODULE_LICENSE("GPL"); | 97 | MODULE_LICENSE("GPL"); |
| 96 | MODULE_AUTHOR("Randy Dunlap"); | 98 | MODULE_AUTHOR("Randy Dunlap"); |
| 97 | MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel"); | 99 | MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel"); |
| 98 | |||
| 99 | #endif /* CONFIG_IKCONFIG_PROC */ | ||