diff options
author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/powerpc/boot/dts/mpc8548cds.dts | |
parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8548cds.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8548cds.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts index 621388db3c9e..d1fa6bbfaea0 100644 --- a/arch/powerpc/boot/dts/mpc8548cds.dts +++ b/arch/powerpc/boot/dts/mpc8548cds.dts | |||
@@ -449,7 +449,7 @@ | |||
449 | interrupts = <26 2>; | 449 | interrupts = <26 2>; |
450 | bus-range = <0 255>; | 450 | bus-range = <0 255>; |
451 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 | 451 | ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000 |
452 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x8000000>; | 452 | 0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>; |
453 | clock-frequency = <33333333>; | 453 | clock-frequency = <33333333>; |
454 | #interrupt-cells = <1>; | 454 | #interrupt-cells = <1>; |
455 | #size-cells = <2>; | 455 | #size-cells = <2>; |
@@ -468,7 +468,7 @@ | |||
468 | 468 | ||
469 | 0x1000000 0x0 0x0 | 469 | 0x1000000 0x0 0x0 |
470 | 0x1000000 0x0 0x0 | 470 | 0x1000000 0x0 0x0 |
471 | 0x0 0x8000000>; | 471 | 0x0 0x100000>; |
472 | }; | 472 | }; |
473 | }; | 473 | }; |
474 | }; | 474 | }; |