projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
arch
/
avr32
/
kernel
/
setup.c
diff --git
a/arch/avr32/kernel/setup.c
b/arch/avr32/kernel/setup.c
index
d08b0bc
..
4b4c188
100644
(file)
--- a/
arch/avr32/kernel/setup.c
+++ b/
arch/avr32/kernel/setup.c
@@
-248,7
+248,7
@@
static int __init early_parse_fbmem(char *p)
fbmem_size = memparse(p, &p);
if (*p == '@') {
- fbmem_start = memparse(p, &p);
+ fbmem_start = memparse(p
+ 1
, &p);
ret = add_reserved_region(fbmem_start,
fbmem_start + fbmem_size - 1,
"Framebuffer");