Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp4xx / Kconfig

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index daadc78e271b47cd9d9338b11a93b0cd4fd023c0..2a39f9e481ad2d455ae6f00b13f26042755f37d8 100644 (file)
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -8,11 +8,10 @@ menu "Intel IXP4xx Implementation Options"
 
 comment "IXP4xx Platforms"
 
 
 comment "IXP4xx Platforms"
 

-# This entry is placed on top because otherwise it would have
-# been shown as a submenu.

 config MACH_NSLU2
        bool
 config MACH_NSLU2
        bool

-       prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715)
+       prompt "Linksys NSLU2"
+       select PCI

        help
          Say 'Y' here if you want your kernel to support Linksys's
          NSLU2 NAS device. For more information on this platform,
        help
          Say 'Y' here if you want your kernel to support Linksys's
          NSLU2 NAS device. For more information on this platform,


@@ -20,6 +19,7 @@ config MACH_NSLU2
 
 config ARCH_AVILA
        bool "Avila"
 
 config ARCH_AVILA
        bool "Avila"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support the Gateworks
          Avila Network Platform. For more information on this platform,
        help
          Say 'Y' here if you want your kernel to support the Gateworks
          Avila Network Platform. For more information on this platform,


@@ -27,6 +27,7 @@ config ARCH_AVILA
 
 config ARCH_ADI_COYOTE
        bool "Coyote"
 
 config ARCH_ADI_COYOTE
        bool "Coyote"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support the ADI 
          Engineering Coyote Gateway Reference Platform. For more
        help
          Say 'Y' here if you want your kernel to support the ADI 
          Engineering Coyote Gateway Reference Platform. For more


@@ -34,6 +35,7 @@ config ARCH_ADI_COYOTE
 
 config ARCH_IXDP425
        bool "IXDP425"
 
 config ARCH_IXDP425
        bool "IXDP425"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support Intel's 
          IXDP425 Development Platform (Also known as Richfield).  
        help
          Say 'Y' here if you want your kernel to support Intel's 
          IXDP425 Development Platform (Also known as Richfield).  


@@ -41,6 +43,7 @@ config ARCH_IXDP425
 
 config MACH_IXDPG425
        bool "IXDPG425"
 
 config MACH_IXDPG425
        bool "IXDPG425"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support Intel's
          IXDPG425 Development Platform (Also known as Montajade).
        help
          Say 'Y' here if you want your kernel to support Intel's
          IXDPG425 Development Platform (Also known as Montajade).


@@ -48,6 +51,7 @@ config MACH_IXDPG425
 
 config MACH_IXDP465
        bool "IXDP465"
 
 config MACH_IXDP465
        bool "IXDP465"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support Intel's
          IXDP465 Development Platform (Also known as BMP).
        help
          Say 'Y' here if you want your kernel to support Intel's
          IXDP465 Development Platform (Also known as BMP).


@@ -74,6 +78,7 @@ config ARCH_PRPMC1100
 config MACH_NAS100D
        bool
        prompt "NAS100D"
 config MACH_NAS100D
        bool
        prompt "NAS100D"

+       select PCI

        help
          Say 'Y' here if you want your kernel to support Iomega's
          NAS 100d device. For more information on this platform,
        help
          Say 'Y' here if you want your kernel to support Iomega's
          NAS 100d device. For more information on this platform,


@@ -98,6 +103,7 @@ config CPU_IXP46X
 config MACH_GTWX5715
        bool "Gemtek WX5715 (Linksys WRV54G)"
        depends on ARCH_IXP4XX
 config MACH_GTWX5715
        bool "Gemtek WX5715 (Linksys WRV54G)"
        depends on ARCH_IXP4XX

+       select PCI

        help
                This board is currently inside the Linksys WRV54G Gateways.
 
        help
                This board is currently inside the Linksys WRV54G Gateways.
 


@@ -112,11 +118,16 @@ config MACH_GTWX5715
                "High Speed" UART is n/c (as far as I can tell)
                20 Pin ARM/Xscale JTAG interface on J2
 
                "High Speed" UART is n/c (as far as I can tell)
                20 Pin ARM/Xscale JTAG interface on J2
 

-

 comment "IXP4xx Options"
 
 comment "IXP4xx Options"
 

+config DMABOUNCE
+       bool
+       default y
+       depends on PCI
+

 config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"
 config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"

+       depends on PCI

        help
           IXP4xx provides two methods of accessing PCI memory space:
 
        help
           IXP4xx provides two methods of accessing PCI memory space: