diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:36:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:36:35 -0800 |
| commit | c5258190c2ae664cdf367417a2a25e5fa4104322 (patch) | |
| tree | d0c914991882bc1009b173696b9919af51d4d56e /arch/microblaze/kernel/prom.c | |
| parent | 1ed55eac3b1fc30b29cdb52251e0f13b24fc344c (diff) | |
| parent | 4378bb695670e65ca4aeee1e7588cfa2381351a5 (diff) | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"The main change is UAPI for Microblaze."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: signal: Declare do_notify_resume
microblaze: lib: Add lib function declarations
microblaze: lib: Remove helper macros
microblaze: Add static qualifiers
microblaze: Wire-up new system call kcmp
microblaze: Fix intc_enable_or_unmask function
microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INIT
microblaze: Remove passing the second arg to schedule_tail
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
microblaze: uaccess.h: Fix timerfd syscall
microblaze: Remove BIP from childregs
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 4a764ccb9f2..a744e3f1888 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -52,9 +52,9 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) } #ifdef CONFIG_EARLY_PRINTK -char *stdout; +static char *stdout; -int __init early_init_dt_scan_chosen_serial(unsigned long node, +static int __init early_init_dt_scan_chosen_serial(unsigned long node, const char *uname, int depth, void *data) { unsigned long l; |