diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-23 18:42:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-23 18:42:11 -0400 |
| commit | 445c9b5507b9d09a2e9b0b4dbb16517708aa40e6 (patch) | |
| tree | d985e54552bebdf8ec1a7e4a0ed4cd289d9428ac /arch/powerpc/platforms/83xx | |
| parent | 390cbb56a731546edc0f35fbc4c5045676467581 (diff) | |
| parent | 98750261fbf6348517ef517f617014de8238475f (diff) | |
Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22
Diffstat (limited to 'arch/powerpc/platforms/83xx')
| -rw-r--r-- | arch/powerpc/platforms/83xx/Kconfig | 6 |
1 files changed, 1 insertions, 5 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 @@ | |||
| 1 | menu "Platform support" | ||
| 2 | depends on PPC_83xx | ||
| 3 | |||
| 4 | choice | 1 | choice |
| 5 | prompt "Machine Type" | 2 | prompt "Machine Type" |
| 3 | depends on PPC_83xx | ||
| 6 | default MPC834x_MDS | 4 | default MPC834x_MDS |
| 7 | 5 | ||
| 8 | config MPC8313_RDB | 6 | config 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 | |||
| 81 | endmenu | ||