diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 04:53:19 -0400 |
commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
tree | 061166d873d9da9cf83044a7593ad111787076c5 /init | |
parent | 0f2c3de2ba110626515234d5d584fb1b0c0749a2 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2cce9f343ad0..5cff9a980c39 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -76,6 +76,14 @@ config INIT_ENV_ARG_LIMIT | |||
76 | variables passed to init from the kernel command line. | 76 | variables passed to init from the kernel command line. |
77 | 77 | ||
78 | 78 | ||
79 | config CROSS_COMPILE | ||
80 | string "Cross-compiler tool prefix" | ||
81 | help | ||
82 | Same as running 'make CROSS_COMPILE=prefix-' but stored for | ||
83 | default make runs in this kernel build directory. You don't | ||
84 | need to set this unless you want the configured kernel build | ||
85 | directory to select the cross-compiler automatically. | ||
86 | |||
79 | config LOCALVERSION | 87 | config LOCALVERSION |
80 | string "Local version - append to kernel release" | 88 | string "Local version - append to kernel release" |
81 | help | 89 | help |