aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-04-12 16:46:21 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-04-12 17:41:12 -0400
commitb5a4834692ab799a7a6b75a7f1e20e9f41a3126e (patch)
tree66e92045aee89f021e8634a1a78f5eb2ad016398 /arch/powerpc/platforms
parent4a89f7fa7a32e35d3b5d956846cd2ae274db5ed2 (diff)
[POWERPC] Convert 83xx platform to unified platform Kconfig
Moved 83xx platform Kconfig over to being sourced by the unified arch/powerpc/platforms/Kconfig. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/83xx/Kconfig6
-rw-r--r--arch/powerpc/platforms/Kconfig3
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 2a23392bb92e..19cafdf6df93 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,8 +1,6 @@
1menu "Platform support"
2 depends on PPC_83xx
3
4choice 1choice
5 prompt "Machine Type" 2 prompt "Machine Type"
3 depends on PPC_83xx
6 default MPC834x_MDS 4 default MPC834x_MDS
7 5
8config MPC8313_RDB 6config MPC8313_RDB
@@ -77,5 +75,3 @@ config PPC_MPC836x
77 select PPC_UDBG_16550 75 select PPC_UDBG_16550
78 select PPC_INDIRECT_PCI 76 select PPC_INDIRECT_PCI
79 default y if MPC836x_MDS 77 default y if MPC836x_MDS
80
81endmenu
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 5f2cef071919..d686806f9621 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_86xx 2 depends on PPC64 || CLASSIC32 || 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/83xx/Kconfig"
48source "arch/powerpc/platforms/86xx/Kconfig" 49source "arch/powerpc/platforms/86xx/Kconfig"
49 50
50config PPC_NATIVE 51config PPC_NATIVE