Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / cris / arch-v32 / drivers / Kconfig

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 2a92cb1886ca298fa15e1af1160d067f910064b2..b9e328e688be8d70837d895698c4d87ee71e696f 100644 (file)
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -342,7 +342,7 @@ config ETRAX_SERIAL_PORT4_DMA9_IN
        help
          Enables the DMA9 input channel for ser4 (ttyS4).
          If you do not enable DMA, an interrupt for each character will be
        help
          Enables the DMA9 input channel for ser4 (ttyS4).
          If you do not enable DMA, an interrupt for each character will be

-         used when receiveing data.
+         used when receiving data.

          Normally you want to use DMA, unless you use the DMA channel for
          something else.
 
          Normally you want to use DMA, unless you use the DMA channel for
          something else.
 


@@ -641,6 +641,7 @@ config PCI
        bool
        depends on ETRAX_CARDBUS
        default y
        bool
        depends on ETRAX_CARDBUS
        default y

+       select HAVE_GENERIC_DMA_COHERENT

 
 config ETRAX_IOP_FW_LOAD
        tristate "IO-processor hotplug firmware loading support"
 
 config ETRAX_IOP_FW_LOAD
        tristate "IO-processor hotplug firmware loading support"