diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-03 22:56:17 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-03 22:56:17 -0400 |
| commit | 701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb (patch) | |
| tree | c07aa954f48ec45c422641052d46008697a4a6b1 /lib/Kconfig | |
| parent | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 170d8ca901d8..5b916bc0fbae 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -181,9 +181,6 @@ config HAS_DMA | |||
| 181 | config CHECK_SIGNATURE | 181 | config CHECK_SIGNATURE |
| 182 | bool | 182 | bool |
| 183 | 183 | ||
| 184 | config HAVE_LMB | ||
| 185 | boolean | ||
| 186 | |||
| 187 | config CPUMASK_OFFSTACK | 184 | config CPUMASK_OFFSTACK |
| 188 | bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS | 185 | bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS |
| 189 | help | 186 | help |