git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[pandora-kernel.git]
/
arch
/
arm
/
plat-s5p
/
dev-fimc2.c
diff --git
a/arch/arm/plat-s5p/dev-fimc2.c
b/arch/arm/plat-s5p/dev-fimc2.c
index
5543d63
..
24d2981
100644
(file)
--- a/
arch/arm/plat-s5p/dev-fimc2.c
+++ b/
arch/arm/plat-s5p/dev-fimc2.c
@@
-19,7
+19,7
@@
static struct resource s5p_fimc2_resource[] = {
[0] = {
.start = S5P_PA_FIMC2,
- .end = S5P_PA_FIMC2 + SZ_
1M
- 1,
+ .end = S5P_PA_FIMC2 + SZ_
4K
- 1,
.flags = IORESOURCE_MEM,
},
[1] = {