diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-02-01 06:06:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 11:53:21 -0500 |
commit | 41a60ef0698394ee320813816baf221bcb533797 (patch) | |
tree | 44156a4497948656098d8b22a6301c58dfd19229 | |
parent | 0679b75e5fb653fbf6691293e7fc45520abae1d7 (diff) |
[PATCH] arm26: select system type via "choice"
Choosing ARCH_ARC and ARCH_A5K together causes redefining and errors
here and there.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/arm26/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig index 274e07019b46..379c7257518e 100644 --- a/arch/arm26/Kconfig +++ b/arch/arm26/Kconfig | |||
@@ -60,7 +60,8 @@ source "init/Kconfig" | |||
60 | 60 | ||
61 | menu "System Type" | 61 | menu "System Type" |
62 | 62 | ||
63 | comment "Archimedes/A5000 Implementations (select only ONE)" | 63 | choice |
64 | prompt "Archimedes/A5000 Implementations" | ||
64 | 65 | ||
65 | config ARCH_ARC | 66 | config ARCH_ARC |
66 | bool "Archimedes" | 67 | bool "Archimedes" |
@@ -87,6 +88,7 @@ config PAGESIZE_16 | |||
87 | Say Y here if your Archimedes or A5000 system has only 2MB of | 88 | Say Y here if your Archimedes or A5000 system has only 2MB of |
88 | memory, otherwise say N. The resulting kernel will not run on a | 89 | memory, otherwise say N. The resulting kernel will not run on a |
89 | machine with 4MB of memory. | 90 | machine with 4MB of memory. |
91 | endchoice | ||
90 | endmenu | 92 | endmenu |
91 | 93 | ||
92 | config ISA_DMA_API | 94 | config ISA_DMA_API |