diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 03:34:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 03:34:02 -0400 |
| commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
| tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/plat-omap | |
| parent | c93212f387fdf5180d9d13cc207419abd5b3ec17 (diff) | |
| parent | 8d7e4cc2c8ea1d180d32d902eb899f27d3ee53d7 (diff) | |
Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/uncompress.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h index 30b891c4a93f..565d2664f5a7 100644 --- a/arch/arm/plat-omap/include/plat/uncompress.h +++ b/arch/arm/plat-omap/include/plat/uncompress.h | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | 27 | ||
| 28 | #define MDR1_MODE_MASK 0x07 | 28 | #define MDR1_MODE_MASK 0x07 |
| 29 | 29 | ||
| 30 | static volatile u8 *uart_base; | 30 | volatile u8 *uart_base; |
| 31 | static int uart_shift; | 31 | int uart_shift; |
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * Store the DEBUG_LL uart number into memory. | 34 | * Store the DEBUG_LL uart number into memory. |