diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-24 02:42:11 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-24 02:42:11 +0400 |
| commit | 445c9b5507b9d09a2e9b0b4dbb16517708aa40e6 (patch) | |
| tree | d985e54552bebdf8ec1a7e4a0ed4cd289d9428ac /arch/powerpc/platforms/86xx | |
| parent | 390cbb56a731546edc0f35fbc4c5045676467581 (diff) | |
| parent | 98750261fbf6348517ef517f617014de8238475f (diff) | |
| download | linux-445c9b5507b9d09a2e9b0b4dbb16517708aa40e6.tar.xz | |
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/86xx')
| -rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 0c70944d0e37..d1bcff500464 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig @@ -1,8 +1,6 @@ -menu "Platform Support" - depends on PPC_86xx - choice prompt "Machine Type" + depends on PPC_86xx default MPC8641_HPCN config MPC8641_HPCN @@ -14,20 +12,10 @@ config MPC8641_HPCN endchoice - config MPC8641 bool select PPC_INDIRECT_PCI + select PPC_INDIRECT_PCI_BE select PPC_UDBG_16550 + select MPIC default y if MPC8641_HPCN - -config MPIC - bool - default y - -config PPC_INDIRECT_PCI_BE - bool - depends on PPC_86xx - default y - -endmenu |