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 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
z2.c
diff --git
a/arch/arm/mach-pxa/z2.c
b/arch/arm/mach-pxa/z2.c
index
07d8bd8
..
f0d0228
100644
(file)
--- a/
arch/arm/mach-pxa/z2.c
+++ b/
arch/arm/mach-pxa/z2.c
@@
-164,7
+164,7
@@
static struct mtd_partition z2_flash_parts[] = {
}, {
.name = "U-Boot Environment",
.offset = 0x40000,
- .size = 0x
6
0000,
+ .size = 0x
2
0000,
}, {
.name = "Flash",
.offset = 0x60000,