aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/Kconfig
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-04-12 17:53:32 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-04-12 17:53:32 -0400
commitd6071f881fcd3c45c00ea1c2d13a5b01bbb6c412 (patch)
treed8c061621e396e8b17fc2f6c9b3967ee337c7dc8 /arch/powerpc/platforms/Kconfig
parentb5a4834692ab799a7a6b75a7f1e20e9f41a3126e (diff)
[POWERPC] Convert 82xx platform to unified platform Kconfig
Moved 82xx platform Kconfig over to being sourced by the unified arch/powerpc/platforms/Kconfig. Also, cleaned up whitespace issues in 82xx Kconfig. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r--arch/powerpc/platforms/Kconfig12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index d686806f9621..efa3a03f76d4 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
1menu "Platform support" 1menu "Platform support"
2 depends on PPC64 || CLASSIC32 || PPC_83xx || PPC_86xx 2 depends on PPC64 || CLASSIC32 || PPC_82xx || PPC_83xx || PPC_86xx
3 3
4choice 4choice
5 prompt "Machine type" 5 prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
45source arch/powerpc/platforms/celleb/Kconfig 45source arch/powerpc/platforms/celleb/Kconfig
46source arch/powerpc/platforms/ps3/Kconfig 46source arch/powerpc/platforms/ps3/Kconfig
47source arch/powerpc/platforms/cell/Kconfig 47source arch/powerpc/platforms/cell/Kconfig
48source "arch/powerpc/platforms/82xx/Kconfig"
48source "arch/powerpc/platforms/83xx/Kconfig" 49source "arch/powerpc/platforms/83xx/Kconfig"
49source "arch/powerpc/platforms/86xx/Kconfig" 50source "arch/powerpc/platforms/86xx/Kconfig"
50 51
@@ -221,4 +222,13 @@ config TAU_AVERAGE
221 222
222 If in doubt, say N here. 223 If in doubt, say N here.
223 224
225config CPM2
226 bool
227 default n
228 help
229 The CPM2 (Communications Processor Module) is a coprocessor on
230 embedded CPUs made by Freescale. Selecting this option means that
231 you wish to build a kernel for a machine with a CPM2 coprocessor
232 on it (826x, 827x, 8560).
233
224endmenu 234endmenu