projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git]
/
arch
/
m68k
/
amiga
/
chipram.c
diff --git
a/arch/m68k/amiga/chipram.c
b/arch/m68k/amiga/chipram.c
index 99449fbf9a726834ec2b2c268956a13f0ab0b99d..ba03cec3f711e024422fe916a407b4cf56556f76 100644
(file)
--- a/
arch/m68k/amiga/chipram.c
+++ b/
arch/m68k/amiga/chipram.c
@@
-87,7
+87,7
@@
void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
atomic_sub(size, &chipavail);
pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
- return
(void *)
ZTWO_VADDR(res->start);
+ return ZTWO_VADDR(res->start);
}
void amiga_chip_free(void *ptr)