diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-12-08 21:46:20 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-12-08 21:46:20 +0800 |
| commit | 9ea1365696a2d9e5926bd75331022ce4f8911605 (patch) | |
| tree | 98f9eae078e460684b552089fd2a3e694497e163 | |
| parent | 731974a6034bb01bc9197e7fd2757eada0d2feec (diff) | |
PASR: fix compile error and warningstopic-pasr-combined-v1-v2
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
| -rw-r--r-- | drivers/staging/pasr/core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/pasr/init.c | 3 | ||||
| -rw-r--r-- | include/linux/pasr.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/pasr/core.c b/drivers/staging/pasr/core.c index 54c574631648..eed4e3ee077d 100644 --- a/drivers/staging/pasr/core.c +++ b/drivers/staging/pasr/core.c @@ -64,7 +64,7 @@ printk("%s: Enter\n", __func__); goto out; } -pr_info("%s: paddr=0x%08x, size=0x%08x\n", __func__, paddr, size); +pr_info("%s: paddr=0x%08x, size=0x%08lx\n", __func__, paddr, size); do { s = pasr_addr2section(pasr.map, paddr); @@ -115,7 +115,7 @@ printk("%s: Enter\n", __func__); return; } -pr_info("%s: paddr=0x%08x, size=0x%08x\n", __func__, paddr, size); +pr_info("%s: paddr=0x%08x, size=0x%08lx\n", __func__, paddr, size); do { s = pasr_addr2section(pasr.map, paddr); diff --git a/drivers/staging/pasr/init.c b/drivers/staging/pasr/init.c index d43fc0dac375..218bf40b0d2b 100644 --- a/drivers/staging/pasr/init.c +++ b/drivers/staging/pasr/init.c @@ -90,7 +90,7 @@ void __init add_ddr_die(phys_addr_t addr, unsigned long size) { BUG_ON(pasr_info.nr_dies >= NR_DIES); -pr_info("%s: addr=0x%08x, size=0x%08x\n", __func__, addr, size); +pr_info("%s: addr=0x%08x, size=0x%08lx\n", __func__, addr, size); pasr_info.die[pasr_info.nr_dies].addr = addr; pasr_info.die[pasr_info.nr_dies++].size = size; @@ -107,7 +107,6 @@ void __init add_interleaved_area(phys_addr_t a1, phys_addr_t a2, } #ifdef DEBUG -#warning "DEBUG enabled, more messages" static void __init pasr_print_info(struct pasr_info *info) { int i; diff --git a/include/linux/pasr.h b/include/linux/pasr.h index f0bb6ef22177..ab6b106470e0 100644 --- a/include/linux/pasr.h +++ b/include/linux/pasr.h @@ -8,7 +8,6 @@ #include <linux/mm.h> #include <linux/spinlock.h> -#include <mach/memory.h> #ifdef CONFIG_PASR |