Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[mv-sheeva.git] / arch / cris / Kconfig

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 3462245fe9fbf1e72ba496c81b76b754cd6f050a..7adac388a77142b2cb7e5d5db4b5483f473c9476 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -438,7 +438,7 @@ config ETRAX_SERIAL_PORT0_DMA1_IN
        help
          Enables the DMA1 input channel for ser0 (ttyS0).
          If you do not enable DMA, an interrupt for each character will be
        help
          Enables the DMA1 input channel for ser0 (ttyS0).
          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.
 


@@ -565,7 +565,7 @@ config ETRAX_SERIAL_PORT2_DMA7_IN
        help
          Enables the DMA7 input channel for ser2 (ttyS2).
          If you do not enable DMA, an interrupt for each character will be
        help
          Enables the DMA7 input channel for ser2 (ttyS2).
          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.
 


@@ -604,7 +604,7 @@ config ETRAX_SERIAL_PORT3_DMA3_IN
        help
          Enables the DMA3 input channel for ser3 (ttyS3).
          If you do not enable DMA, an interrupt for each character will be
        help
          Enables the DMA3 input channel for ser3 (ttyS3).
          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.