diff options
author | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
tree | d18f58349ced242aa62e622e381e60933f71d451 /include/asm-arm/arch-l7200/serial_l7200.h | |
parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
download | blackbird-op-linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.gz blackbird-op-linux-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip |
Merge branch 'merge'
Diffstat (limited to 'include/asm-arm/arch-l7200/serial_l7200.h')
-rw-r--r-- | include/asm-arm/arch-l7200/serial_l7200.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-l7200/serial_l7200.h b/include/asm-arm/arch-l7200/serial_l7200.h index 238c595d97ea..b1008a9d23e5 100644 --- a/include/asm-arm/arch-l7200/serial_l7200.h +++ b/include/asm-arm/arch-l7200/serial_l7200.h @@ -28,7 +28,7 @@ #define UARTDR 0x00 /* Tx/Rx data */ #define RXSTAT 0x04 /* Rx status */ #define H_UBRLCR 0x08 /* mode register high */ -#define M_UBRLCR 0x0C /* mode reg mid (MSB of buad)*/ +#define M_UBRLCR 0x0C /* mode reg mid (MSB of baud)*/ #define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/ #define UARTCON 0x14 /* control register */ #define UARTFLG 0x18 /* flag register */ |