Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...

[~andy/linux] / arch / arm / mach-ixp2000 / Kconfig

diff --git a/arch/arm/mach-ixp2000/Kconfig b/arch/arm/mach-ixp2000/Kconfig
index 9361e05f6fa39e5519608c6e13fd806bbffd250c..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
-         this card, see <file:Documentation/arm/ENP2611>.
+         this card, see <file:Documentation/arm/IXP2000>.
 
 config ARCH_IXDP2400
        bool "Support Intel IXDP2400"
@@ -43,17 +43,30 @@ config ARCH_IXDP2401
          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
-         IXDP2801 reference platform. For more information on
+         IXDP2801/2805/2855 reference platforms. For more information on
          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
        default y       
 
+config IXP2000_SUPPORT_BROKEN_PCI_IO
+       bool "Support broken PCI I/O on older IXP2000s"
+       default y
+       help
+         Say 'N' here if you only intend to run your kernel on an
+         IXP2000 B0 or later model and do not need the PCI I/O
+         byteswap workaround.  Say 'Y' otherwise.
+
 endmenu
 
 endif