summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 13:51:04 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-09-20 15:52:38 +1000
commit1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22 (patch)
tree493477b7a19606c66de2f003bca83672f2164cad /arch/powerpc/boot
parentc26afe9e8591f306d79aab8071f1d34e4f60b700 (diff)
parent9d037a777695993ec7437e5f451647dea7919d4c (diff)
Merge remote-tracking branch 'origin/master' into next
(Merge in order to get the PCIe mps/mrss code fixes)
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/p1023rds.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts
index bfa96aa8f2c..d9b776740a6 100644
--- a/arch/powerpc/boot/dts/p1023rds.dts
+++ b/arch/powerpc/boot/dts/p1023rds.dts
@@ -387,7 +387,7 @@
#size-cells = <1>;
compatible = "cfi-flash";
reg = <0x0 0x0 0x02000000>;
- bank-width = <1>;
+ bank-width = <2>;
device-width = <1>;
partition@0 {
label = "ramdisk";