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 'integration' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
include
/
mach
/
uncompress.h
diff --git
a/arch/arm/mach-s5p64x0/include/mach/uncompress.h
b/arch/arm/mach-s5p64x0/include/mach/uncompress.h
index
c65b229
..
1608faf
100644
(file)
--- a/
arch/arm/mach-s5p64x0/include/mach/uncompress.h
+++ b/
arch/arm/mach-s5p64x0/include/mach/uncompress.h
@@
-24,8
+24,8
@@
typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
/* uart setup */
/* uart setup */
-
static
unsigned int fifo_mask;
-
static
unsigned int fifo_max;
+unsigned int fifo_mask;
+unsigned int fifo_max;
/* forward declerations */
/* forward declerations */
@@
-43,7
+43,7
@@
static void arch_detect_cpu(void);
/* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14)
/* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14)
-
static
unsigned long uart_base;
+unsigned long uart_base;
static __inline__ void get_uart_base(void)
{
static __inline__ void get_uart_base(void)
{