git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/mach-pxa/include/mach/uncompress.h
b/arch/arm/mach-pxa/include/mach/uncompress.h
index
759b851
..
5519a34
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/
arch/arm/mach-pxa/include/mach/uncompress.h
@@
-16,9
+16,9
@@
#define BTUART_BASE (0x40200000)
#define STUART_BASE (0x40700000)
#define BTUART_BASE (0x40200000)
#define STUART_BASE (0x40700000)
-
static
unsigned long uart_base;
-
static
unsigned int uart_shift;
-
static
unsigned int uart_is_pxa;
+unsigned long uart_base;
+unsigned int uart_shift;
+unsigned int uart_is_pxa;
static inline unsigned char uart_read(int offset)
{
static inline unsigned char uart_read(int offset)
{