aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 15:18:44 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-29 15:18:44 -0800
commitb73384f06159d8388d7d17913b7e3a07e234c1ab (patch)
treea904d01d583bdb7190cdb0e7da1c4b59bef45248 /arch/arm/Kconfig
parentc9e71002aacc9821e99531dcc130db88bbc8ad05 (diff)
parentd862ccc570c875e1454fc57ed00f5a1081985b26 (diff)
downloadkernel_samsung_smdk4412-b73384f06159d8388d7d17913b7e3a07e234c1ab.zip
kernel_samsung_smdk4412-b73384f06159d8388d7d17913b7e3a07e234c1ab.tar.gz
kernel_samsung_smdk4412-b73384f06159d8388d7d17913b7e3a07e234c1ab.tar.bz2
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4843/1: Add GCR_CLKBPB for PXA3xx [ARM] 4842/1: pxa: remove redundant IRQ saving/restoring in clk_pxa3xx_cken_* [ARM] 4841/1: pxa: fix typo in LCD platform data definition code for zylonite [ARM] 4840/1: pxa: fix the typo in get_irqnr_and_base [ARM] 4839/1: fixes kernel Oops in /dev/mem device driver for memory map with PHYS_OFF [ARM] eliminate MODULE_PARM() usage [ARM] 4838/1: Fix kexec for SA1100 machines [ARM] 4837/1: make __get_unaligned_*() return unsigned types [ARM] 4836/1: Make ATAGS_PROC depend on KEXEC
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9619c43..16b82e1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -939,7 +939,8 @@ config KEXEC
config ATAGS_PROC
bool "Export atags in procfs"
- default n
+ depends on KEXEC
+ default y
help
Should the atags used to boot the kernel be exported in an "atags"
file in procfs. Useful with kexec.