diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 09:34:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-07 09:34:02 +0200 |
| commit | 7b76415375ba91f5a06f8d5179278c03d6151d16 (patch) | |
| tree | 11f156309efb05174906954efc5159a15b202437 /arch/arm/plat-samsung | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | ARM: zImage: make sure no GOTOFF relocs are used with .bss symbols (diff) | |
| download | linux-7b76415375ba91f5a06f8d5179278c03d6151d16.tar.xz linux-7b76415375ba91f5a06f8d5179278c03d6151d16.zip | |
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 */ /* uart setup */ -static unsigned int fifo_mask; -static unsigned int fifo_max; +unsigned int fifo_mask; +unsigned int fifo_max; /* forward declerations */ |