summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood-ib62x0.dts
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-10-06 08:56:43 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2016-10-06 08:56:43 +0100
commit301a36fa700f9add6e14f5a95c7573e01578343a (patch)
tree6ff94ff3b08b838353b9127eb5f8055b3de6b25f /arch/arm/boot/dts/kirkwood-ib62x0.dts
parentb828f960215f02e5d2c88bbd27565c694254a15a (diff)
parentb60752f2b20c167859943e001727f0d4da419b23 (diff)
downloadlinux-301a36fa700f9add6e14f5a95c7573e01578343a.tar.bz2
Merge branches 'misc' and 'sa1111-base' into for-linus
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-ib62x0.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index ef84d8699a76..5bf62897014c 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -113,7 +113,7 @@
partition@e0000 {
label = "u-boot environment";
- reg = <0xe0000 0x100000>;
+ reg = <0xe0000 0x20000>;
};
partition@100000 {