aboutsummaryrefslogtreecommitdiff
path: root/include/linux/serial_reg.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-12 12:59:05 +0000
commit163849ea9b4c5d50fbd324692461983d18faadad (patch)
tree7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/serial_reg.h
parent2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff)
parent5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff)
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/linux/serial_reg.h')
-rw-r--r--include/linux/serial_reg.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 850db2e8051..cf9327c051a 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -216,10 +216,10 @@
#define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */
-#define UART_FCR_PXAR1 0x00 /* receive FIFO treshold = 1 */
-#define UART_FCR_PXAR8 0x40 /* receive FIFO treshold = 8 */
-#define UART_FCR_PXAR16 0x80 /* receive FIFO treshold = 16 */
-#define UART_FCR_PXAR32 0xc0 /* receive FIFO treshold = 32 */
+#define UART_FCR_PXAR1 0x00 /* receive FIFO threshold = 1 */
+#define UART_FCR_PXAR8 0x40 /* receive FIFO threshold = 8 */
+#define UART_FCR_PXAR16 0x80 /* receive FIFO threshold = 16 */
+#define UART_FCR_PXAR32 0xc0 /* receive FIFO threshold = 32 */