diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 07:38:02 -0400 |
commit | 5292ae11babca23c3ff82593630d2d7eebc350a9 (patch) | |
tree | 30a6c8123b35686098f306ea39398b7621f42054 /arch/xtensa/Kconfig | |
parent | b0f209898f1a177bd503d49215b8c6628797a81c (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) |
Merge commit 'v2.6.28-rc2' into x86/uv
Diffstat (limited to 'arch/xtensa/Kconfig')
-rw-r--r-- | arch/xtensa/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index a213260b51e5..6c873dceb177 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -64,7 +64,12 @@ choice | |||
64 | default XTENSA_VARIANT_FSF | 64 | default XTENSA_VARIANT_FSF |
65 | 65 | ||
66 | config XTENSA_VARIANT_FSF | 66 | config XTENSA_VARIANT_FSF |
67 | bool "fsf" | 67 | bool "fsf - default (not generic) configuration" |
68 | |||
69 | config XTENSA_VARIANT_DC232B | ||
70 | bool "dc232b - Diamond 232L Standard Core Rev.B (LE)" | ||
71 | help | ||
72 | This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE). | ||
68 | endchoice | 73 | endchoice |
69 | 74 | ||
70 | config MMU | 75 | config MMU |