diff options
| author | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-10-31 08:36:18 -0400 |
| commit | 0588000eac9ba4178cebade437da3b28e8fad48f (patch) | |
| tree | 697e514a0a0193f17a54f372dd18c5cd3927e154 /arch/powerpc/boot/dts/mpc8544ds.dts | |
| parent | 8b5869ad85f703ffeb25e656eab826f6b85b984c (diff) | |
| parent | 81c52c56e2b43589091ee29038bcf793d3f184ab (diff) | |
Merge commit 'origin/queue' into for-queue
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8544ds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8544ds.dts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index e934987e882b..ed38874c3a36 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
| @@ -20,8 +20,10 @@ | |||
| 20 | reg = <0 0 0 0>; // Filled by U-Boot | 20 | reg = <0 0 0 0>; // Filled by U-Boot |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | lbc: localbus@e0005000 { | 23 | board_lbc: lbc: localbus@e0005000 { |
| 24 | reg = <0 0xe0005000 0 0x1000>; | 24 | reg = <0 0xe0005000 0 0x1000>; |
| 25 | |||
| 26 | ranges = <0x0 0x0 0x0 0xff800000 0x800000>; | ||
| 25 | }; | 27 | }; |
| 26 | 28 | ||
| 27 | board_soc: soc: soc8544@e0000000 { | 29 | board_soc: soc: soc8544@e0000000 { |