diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:23:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-05 19:23:02 -0400 |
| commit | a8c725045eb2eaa6c28a5493cb193f47a5c4afe4 (patch) | |
| tree | c391726aa0daa077ef3675ab375c253814ae6f9b /include | |
| parent | 2f9c3c2c24af5f2e6061756d6fc04fdf66f41106 (diff) | |
| parent | e853534e6b94f87e48f29e1701c3f6f8a63669c5 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] typo: buad -> baud
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-l7200/serial_l7200.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-l7200/uncompress.h | 2 |
2 files changed, 2 insertions, 2 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 @@ | |||
| 28 | #define UARTDR 0x00 /* Tx/Rx data */ | 28 | #define UARTDR 0x00 /* Tx/Rx data */ |
| 29 | #define RXSTAT 0x04 /* Rx status */ | 29 | #define RXSTAT 0x04 /* Rx status */ |
| 30 | #define H_UBRLCR 0x08 /* mode register high */ | 30 | #define H_UBRLCR 0x08 /* mode register high */ |
| 31 | #define M_UBRLCR 0x0C /* mode reg mid (MSB of buad)*/ | 31 | #define M_UBRLCR 0x0C /* mode reg mid (MSB of baud)*/ |
| 32 | #define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/ | 32 | #define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/ |
| 33 | #define UARTCON 0x14 /* control register */ | 33 | #define UARTCON 0x14 /* control register */ |
| 34 | #define UARTFLG 0x18 /* flag register */ | 34 | #define UARTFLG 0x18 /* flag register */ |
diff --git a/include/asm-arm/arch-l7200/uncompress.h b/include/asm-arm/arch-l7200/uncompress.h index 9fcd40aee3e3..04be2a088639 100644 --- a/include/asm-arm/arch-l7200/uncompress.h +++ b/include/asm-arm/arch-l7200/uncompress.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Changelog: | 6 | * Changelog: |
| 7 | * 05-01-2000 SJH Created | 7 | * 05-01-2000 SJH Created |
| 8 | * 05-13-2000 SJH Filled in function bodies | 8 | * 05-13-2000 SJH Filled in function bodies |
| 9 | * 07-26-2000 SJH Removed hard coded buad rate | 9 | * 07-26-2000 SJH Removed hard coded baud rate |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <asm/hardware.h> | 12 | #include <asm/hardware.h> |