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-samsung | |
| 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-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/uncompress.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h index 7d6ed7263d57..ee48e12a1e72 100644 --- a/arch/arm/plat-samsung/include/plat/uncompress.h +++ b/arch/arm/plat-samsung/include/plat/uncompress.h | |||
| @@ -18,8 +18,8 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ | |||
| 18 | 18 | ||
| 19 | /* uart setup */ | 19 | /* uart setup */ |
| 20 | 20 | ||
| 21 | static unsigned int fifo_mask; | 21 | unsigned int fifo_mask; |
| 22 | static unsigned int fifo_max; | 22 | unsigned int fifo_max; |
| 23 | 23 | ||
| 24 | /* forward declerations */ | 24 | /* forward declerations */ |
| 25 | 25 | ||