summaryrefslogtreecommitdiff
path: root/arch/frv/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-24 14:48:46 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-24 14:48:46 +0400
commit8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch)
treed535f46a917e14e90deccb29ad00aac016ad18dd /arch/frv/Kconfig
parent4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff)
parent57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff)
downloadlinux-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.xz
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'arch/frv/Kconfig')
-rw-r--r--arch/frv/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index a5aac1b07562..9d1552a9ee2c 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -66,6 +66,8 @@ mainmenu "Fujitsu FR-V Kernel Configuration"
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
+
menu "Fujitsu FR-V system setup"