diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-pxa | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
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-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 759b851ec985..5519a34b667f 100644 --- a/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/arch/arm/mach-pxa/include/mach/uncompress.h | |||
| @@ -16,9 +16,9 @@ | |||
| 16 | #define BTUART_BASE (0x40200000) | 16 | #define BTUART_BASE (0x40200000) |
| 17 | #define STUART_BASE (0x40700000) | 17 | #define STUART_BASE (0x40700000) |
| 18 | 18 | ||
| 19 | static unsigned long uart_base; | 19 | unsigned long uart_base; |
| 20 | static unsigned int uart_shift; | 20 | unsigned int uart_shift; |
| 21 | static unsigned int uart_is_pxa; | 21 | unsigned int uart_is_pxa; |
| 22 | 22 | ||
| 23 | static inline unsigned char uart_read(int offset) | 23 | static inline unsigned char uart_read(int offset) |
| 24 | { | 24 | { |