diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-14 14:22:56 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-14 14:22:56 +0100 |
commit | 81d9b69d4373cd43d8a2b6ffc41777696652ba92 (patch) | |
tree | 8e02f709e1d9c9a24f813797a1d6b3a4047a7f20 /arch/microblaze | |
parent | c5ef7b02ea3417a976c8cae498367846d3f9fbbd (diff) | |
parent | 5db0038f3a92fd7295d50c132033f14c8e0a80c3 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rt
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index abdfb10e7eca..c76630603058 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -43,13 +43,13 @@ #include <asm/pci-bridge.h> #ifdef CONFIG_EARLY_PRINTK -static char *stdout; +static const char *stdout; static int __init early_init_dt_scan_chosen_serial(unsigned long node, const char *uname, int depth, void *data) { - unsigned long l; - char *p; + int l; + const char *p; pr_debug("%s: depth: %d, uname: %s\n", __func__, depth, uname); @@ -80,7 +80,7 @@ static int __init early_init_dt_scan_chosen_serial(unsigned long node, (strncmp(p, "xlnx,opb-uartlite", 17) == 0) || (strncmp(p, "xlnx,axi-uartlite", 17) == 0) || (strncmp(p, "xlnx,mdm", 8) == 0)) { - unsigned int *addrp; + const unsigned int *addrp; *(u32 *)data = UARTLITE; |