diff options
| author | Kumar Gala | 2007-04-12 22:46:21 +0200 |
|---|---|---|
| committer | Kumar Gala | 2007-04-12 23:41:12 +0200 |
| commit | b5a4834692ab799a7a6b75a7f1e20e9f41a3126e (patch) | |
| tree | 66e92045aee89f021e8634a1a78f5eb2ad016398 /arch | |
| parent | [POWERPC] Convert 86xx platform to unified platform Kconfig (diff) | |
| download | kernel-qcow2-linux-b5a4834692ab799a7a6b75a7f1e20e9f41a3126e.tar.gz kernel-qcow2-linux-b5a4834692ab799a7a6b75a7f1e20e9f41a3126e.tar.xz kernel-qcow2-linux-b5a4834692ab799a7a6b75a7f1e20e9f41a3126e.zip | |
[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')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index d37e0b89eb0b..8576ff3344cc 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -378,7 +378,6 @@ source "arch/powerpc/platforms/Kconfig" source arch/powerpc/platforms/embedded6xx/Kconfig source arch/powerpc/platforms/4xx/Kconfig source arch/powerpc/platforms/82xx/Kconfig -source arch/powerpc/platforms/83xx/Kconfig source arch/powerpc/platforms/85xx/Kconfig source arch/powerpc/platforms/8xx/Kconfig 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 @@ -menu "Platform support" - depends on PPC_83xx - choice prompt "Machine Type" + depends on PPC_83xx default MPC834x_MDS config MPC8313_RDB @@ -77,5 +75,3 @@ config PPC_MPC836x select PPC_UDBG_16550 select PPC_INDIRECT_PCI default y if MPC836x_MDS - -endmenu 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 @@ menu "Platform support" - depends on PPC64 || CLASSIC32 || PPC_86xx + depends on PPC64 || CLASSIC32 || PPC_83xx || PPC_86xx choice prompt "Machine type" @@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig" source arch/powerpc/platforms/celleb/Kconfig source arch/powerpc/platforms/ps3/Kconfig source arch/powerpc/platforms/cell/Kconfig +source "arch/powerpc/platforms/83xx/Kconfig" source "arch/powerpc/platforms/86xx/Kconfig" config PPC_NATIVE |