Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 86xx / Kconfig

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0faebfdc1596978fc55e7e565288fbadf767ed34..21d113536b86bc2a723109982f05b3c04212af83 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -7,15 +7,28 @@ config MPC8641_HPCN
        bool "Freescale MPC8641 HPCN"
        select PPC_I8259
        select DEFAULT_UIMAGE
+       select FSL_ULI1575
        help
          This option enables support for the MPC8641 HPCN board.
 
+config MPC8610_HPCD
+       bool "Freescale MPC8610 HPCD"
+       select DEFAULT_UIMAGE
+       help
+         This option enables support for the MPC8610 HPCD board.
+
 endchoice
 
 config MPC8641
        bool
-       select PPC_INDIRECT_PCI
-       select PPC_INDIRECT_PCI_BE
+       select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC
        default y if MPC8641_HPCN
+
+config MPC8610
+       bool
+       select FSL_PCI if PCI
+       select PPC_UDBG_16550
+       select MPIC
+       default y if MPC8610_HPCD