diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/asm-arm/arch-lh7a40x/uncompress.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/arch-lh7a40x/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-lh7a40x/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-lh7a40x/uncompress.h b/include/asm-arm/arch-lh7a40x/uncompress.h index f8053346f608..3d1ce0426a33 100644 --- a/include/asm-arm/arch-lh7a40x/uncompress.h +++ b/include/asm-arm/arch-lh7a40x/uncompress.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #ifndef UART_R_STATUS | 16 | #ifndef UART_R_STATUS |
| 17 | # define UART_R_STATUS (0x10) | 17 | # define UART_R_STATUS (0x10) |
| 18 | #endif | 18 | #endif |
| 19 | #define nTxRdy (0x20) /* Not TxReady (literally Tx FIFO full) */ | 19 | #define nTxRdy (0x20) /* Not TxReady (literally Tx FIFO full) */ |
| 20 | 20 | ||
| 21 | /* Access UART with physical addresses before MMU is setup */ | 21 | /* Access UART with physical addresses before MMU is setup */ |
| 22 | #define UART_STATUS (*(volatile unsigned long*) (UART2_PHYS + UART_R_STATUS)) | 22 | #define UART_STATUS (*(volatile unsigned long*) (UART2_PHYS + UART_R_STATUS)) |