summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 20:28:04 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 20:28:04 +0200
commit9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch)
tree894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-ux500
parentMerge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and... (diff)
parentARM: Fix generic irq chip (diff)
downloadlinux-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.tar.xz
linux-9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0.zip
Merge branch 'devel-stable' into for-linus
Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/include/mach/uncompress.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h
index ab0fe1432fae..088b550c40df 100644
--- a/arch/arm/mach-ux500/include/mach/uncompress.h
+++ b/arch/arm/mach-ux500/include/mach/uncompress.h
@@ -24,7 +24,7 @@
#include <linux/amba/serial.h>
#include <mach/hardware.h>
-static u32 ux500_uart_base;
+u32 ux500_uart_base;
static void putc(const char c)
{