diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /arch/powerpc/boot/dts/mpc8379_rdb.dts | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8379_rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8379_rdb.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts index d4838af8d379..9b1da864d890 100644 --- a/arch/powerpc/boot/dts/mpc8379_rdb.dts +++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts | |||
| @@ -424,7 +424,7 @@ | |||
| 424 | bus-range = <0x0 0x0>; | 424 | bus-range = <0x0 0x0>; |
| 425 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 | 425 | ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 |
| 426 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 | 426 | 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 |
| 427 | 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; | 427 | 0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>; |
| 428 | sleep = <&pmc 0x00010000>; | 428 | sleep = <&pmc 0x00010000>; |
| 429 | clock-frequency = <66666666>; | 429 | clock-frequency = <66666666>; |
| 430 | #interrupt-cells = <1>; | 430 | #interrupt-cells = <1>; |