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/mach-rpc | |
| 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/mach-rpc')
| -rw-r--r-- | arch/arm/mach-rpc/include/mach/uncompress.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index 8c9e2c7161c6..9cd9bcdad6cc 100644 --- a/arch/arm/mach-rpc/include/mach/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h | |||
| @@ -66,12 +66,12 @@ extern __attribute__((pure)) struct param_struct *params(void); | |||
| 66 | #define params (params()) | 66 | #define params (params()) |
| 67 | 67 | ||
| 68 | #ifndef STANDALONE_DEBUG | 68 | #ifndef STANDALONE_DEBUG |
| 69 | static unsigned long video_num_cols; | 69 | unsigned long video_num_cols; |
| 70 | static unsigned long video_num_rows; | 70 | unsigned long video_num_rows; |
| 71 | static unsigned long video_x; | 71 | unsigned long video_x; |
| 72 | static unsigned long video_y; | 72 | unsigned long video_y; |
| 73 | static unsigned char bytes_per_char_v; | 73 | unsigned char bytes_per_char_v; |
| 74 | static int white; | 74 | int white; |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * This does not append a newline | 77 | * This does not append a newline |