diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /arch/cris/arch-v32/drivers/Kconfig | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'arch/cris/arch-v32/drivers/Kconfig')
| -rw-r--r-- | arch/cris/arch-v32/drivers/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index a33097f9536..f64624fc450 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
| @@ -88,7 +88,7 @@ config ETRAX_SERIAL_PORT0_DMA7_IN | |||
| 88 | help | 88 | help |
| 89 | Enables the DMA7 input channel for ser0 (ttyS0). | 89 | Enables the DMA7 input channel for ser0 (ttyS0). |
| 90 | If you do not enable DMA, an interrupt for each character will be | 90 | If you do not enable DMA, an interrupt for each character will be |
| 91 | used when receiveing data. | 91 | used when receiving data. |
| 92 | Normally you want to use DMA, unless you use the DMA channel for | 92 | Normally you want to use DMA, unless you use the DMA channel for |
| 93 | something else. | 93 | something else. |
| 94 | 94 | ||
| @@ -157,7 +157,7 @@ config ETRAX_SERIAL_PORT1_DMA5_IN | |||
| 157 | help | 157 | help |
| 158 | Enables the DMA5 input channel for ser1 (ttyS1). | 158 | Enables the DMA5 input channel for ser1 (ttyS1). |
| 159 | If you do not enable DMA, an interrupt for each character will be | 159 | If you do not enable DMA, an interrupt for each character will be |
| 160 | used when receiveing data. | 160 | used when receiving data. |
| 161 | Normally you want this on, unless you use the DMA channel for | 161 | Normally you want this on, unless you use the DMA channel for |
| 162 | something else. | 162 | something else. |
| 163 | 163 | ||
| @@ -228,7 +228,7 @@ config ETRAX_SERIAL_PORT2_DMA3_IN | |||
| 228 | help | 228 | help |
| 229 | Enables the DMA3 input channel for ser2 (ttyS2). | 229 | Enables the DMA3 input channel for ser2 (ttyS2). |
| 230 | If you do not enable DMA, an interrupt for each character will be | 230 | If you do not enable DMA, an interrupt for each character will be |
| 231 | used when receiveing data. | 231 | used when receiving data. |
| 232 | Normally you want to use DMA, unless you use the DMA channel for | 232 | Normally you want to use DMA, unless you use the DMA channel for |
| 233 | something else. | 233 | something else. |
| 234 | 234 | ||
| @@ -297,7 +297,7 @@ config ETRAX_SERIAL_PORT3_DMA9_IN | |||
| 297 | help | 297 | help |
| 298 | Enables the DMA9 input channel for ser3 (ttyS3). | 298 | Enables the DMA9 input channel for ser3 (ttyS3). |
| 299 | If you do not enable DMA, an interrupt for each character will be | 299 | If you do not enable DMA, an interrupt for each character will be |
| 300 | used when receiveing data. | 300 | used when receiving data. |
| 301 | Normally you want to use DMA, unless you use the DMA channel for | 301 | Normally you want to use DMA, unless you use the DMA channel for |
| 302 | something else. | 302 | something else. |
| 303 | 303 | ||