Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/mach-ixp2000/Kconfig b/arch/arm/mach-ixp2000/Kconfig
index 9361e05..86f53f8 100644 (file)
--- a/arch/arm/mach-ixp2000/Kconfig
+++ b/arch/arm/mach-ixp2000/Kconfig
@@ -43,17 +43,30 @@ 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
        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
 endmenu
 
 endif