diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/p2020si-post.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi index 332e9e75e6c2..884e01bcb243 100644 --- a/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | |||
| @@ -171,6 +171,9 @@ | |||
| 171 | 171 | ||
| 172 | /include/ "pq3-dma-0.dtsi" | 172 | /include/ "pq3-dma-0.dtsi" |
| 173 | /include/ "pq3-usb2-dr-0.dtsi" | 173 | /include/ "pq3-usb2-dr-0.dtsi" |
| 174 | usb@22000 { | ||
| 175 | compatible = "fsl-usb2-dr-v1.6", "fsl-usb2-dr"; | ||
| 176 | }; | ||
| 174 | /include/ "pq3-etsec1-0.dtsi" | 177 | /include/ "pq3-etsec1-0.dtsi" |
| 175 | /include/ "pq3-etsec1-timer-0.dtsi" | 178 | /include/ "pq3-etsec1-timer-0.dtsi" |
| 176 | 179 | ||