diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/arm/mach-iop33x/include | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/arm/mach-iop33x/include')
| -rw-r--r-- | arch/arm/mach-iop33x/include/mach/uncompress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop33x/include/mach/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h index b42423f63302..f99bb848c5a1 100644 --- a/arch/arm/mach-iop33x/include/mach/uncompress.h +++ b/arch/arm/mach-iop33x/include/mach/uncompress.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <linux/serial_reg.h> | 7 | #include <linux/serial_reg.h> |
| 8 | #include <mach/hardware.h> | 8 | #include <mach/hardware.h> |
| 9 | 9 | ||
| 10 | static volatile u32 *uart_base; | 10 | volatile u32 *uart_base; |
| 11 | 11 | ||
| 12 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) | 12 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) |
| 13 | 13 | ||