Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / 86xx / Kconfig

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 3a87863d287611d94984dc06c35a2ade3d6c5449..d1bcff5004645ea33ca237a55c32e9ad8c04d9c4 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,36 +1,21 @@
-menu "Platform Support"
-       depends on PPC_86xx
-
 choice
        prompt "Machine Type"
+       depends on PPC_86xx
        default MPC8641_HPCN
 
 config MPC8641_HPCN
        bool "Freescale MPC8641 HPCN"
+       select PPC_I8259
+       select DEFAULT_UIMAGE
        help
          This option enables support for the MPC8641 HPCN board.
 
 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
-
-config PPC_STD_MMU
-       bool
-       depends on PPC_86xx
-       default y
-
-endmenu