Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / arm / mach-ixp2000 / Kconfig

diff --git a/arch/arm/mach-ixp2000/Kconfig b/arch/arm/mach-ixp2000/Kconfig
index ecb58d83478e32e511a77937328cfd79ef5f290a..08d2707f6ca8aab66ffdfbb502175a31fd144f9e 100644 (file)
--- a/arch/arm/mach-ixp2000/Kconfig
+++ b/arch/arm/mach-ixp2000/Kconfig
@@ -14,7 +14,7 @@ config ARCH_ENP2611
        help
          Say 'Y' here if you want your kernel to support the Radisys
          ENP2611 PCI network processing card. For more information on
        help
          Say 'Y' here if you want your kernel to support the Radisys
          ENP2611 PCI network processing card. For more information on

-         this card, see <file:Documentation/arm/ENP2611>.
+         this card, see <file:Documentation/arm/IXP2000>.

 
 config ARCH_IXDP2400
        bool "Support Intel IXDP2400"
 
 config ARCH_IXDP2400
        bool "Support Intel IXDP2400"


@@ -43,12 +43,17 @@ config ARCH_IXDP2401
          this platform, see <file:Documentation/arm/IXP2000>.
 
 config ARCH_IXDP2801
          this platform, see <file:Documentation/arm/IXP2000>.
 
 config ARCH_IXDP2801

-       bool "Support Intel IXDP2801"
+       bool "Support Intel IXDP2801 and IXDP28x5"

        help
          Say 'Y' here if you want your kernel to support the Intel
        help
          Say 'Y' here if you want your kernel to support the Intel

-         IXDP2801 reference platform. For more information on
+         IXDP2801/2805/2855 reference platforms. For more information on

          this platform, see <file:Documentation/arm/IXP2000>.
 
          this platform, see <file:Documentation/arm/IXP2000>.
 

+config MACH_IXDP28X5
+       bool
+       depends on ARCH_IXDP2801
+       default y
+

 config ARCH_IXDP2X01
        bool
        depends on ARCH_IXDP2401 || ARCH_IXDP2801
 config ARCH_IXDP2X01
        bool
        depends on ARCH_IXDP2401 || ARCH_IXDP2801