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/fsl/p5020si-pre.dtsi | |
| 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/fsl/p5020si-pre.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi index ae823a47584e..0a198b0a77e5 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | |||
| @@ -33,6 +33,9 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | /dts-v1/; | 35 | /dts-v1/; |
| 36 | |||
| 37 | /include/ "e5500_power_isa.dtsi" | ||
| 38 | |||
| 36 | / { | 39 | / { |
| 37 | compatible = "fsl,P5020"; | 40 | compatible = "fsl,P5020"; |
| 38 | #address-cells = <2>; | 41 | #address-cells = <2>; |