diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-19 23:51:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-09-20 01:52:38 -0400 |
| commit | 1cce058b29e7eb8a71a72d8bb87eb7b4e0401c22 (patch) | |
| tree | 493477b7a19606c66de2f003bca83672f2164cad /arch/powerpc/boot | |
| parent | c26afe9e8591f306d79aab8071f1d34e4f60b700 (diff) | |
| parent | 9d037a777695993ec7437e5f451647dea7919d4c (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.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/p1023rds.dts b/arch/powerpc/boot/dts/p1023rds.dts index bfa96aa8f2ca..d9b776740a67 100644 --- a/arch/powerpc/boot/dts/p1023rds.dts +++ b/arch/powerpc/boot/dts/p1023rds.dts | |||
| @@ -387,7 +387,7 @@ | |||
| 387 | #size-cells = <1>; | 387 | #size-cells = <1>; |
| 388 | compatible = "cfi-flash"; | 388 | compatible = "cfi-flash"; |
| 389 | reg = <0x0 0x0 0x02000000>; | 389 | reg = <0x0 0x0 0x02000000>; |
| 390 | bank-width = <1>; | 390 | bank-width = <2>; |
| 391 | device-width = <1>; | 391 | device-width = <1>; |
| 392 | partition@0 { | 392 | partition@0 { |
| 393 | label = "ramdisk"; | 393 | label = "ramdisk"; |