diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /arch/powerpc/boot/dts/p1022ds.dts | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'arch/powerpc/boot/dts/p1022ds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/p1022ds.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts index 8bcb10b92677..d086e0f8bbd3 100644 --- a/arch/powerpc/boot/dts/p1022ds.dts +++ b/arch/powerpc/boot/dts/p1022ds.dts | |||
| @@ -280,13 +280,13 @@ | |||
| 280 | ranges = <0x0 0xc100 0x200>; | 280 | ranges = <0x0 0xc100 0x200>; |
| 281 | cell-index = <1>; | 281 | cell-index = <1>; |
| 282 | dma00: dma-channel@0 { | 282 | dma00: dma-channel@0 { |
| 283 | compatible = "fsl,eloplus-dma-channel"; | 283 | compatible = "fsl,ssi-dma-channel"; |
| 284 | reg = <0x0 0x80>; | 284 | reg = <0x0 0x80>; |
| 285 | cell-index = <0>; | 285 | cell-index = <0>; |
| 286 | interrupts = <76 2>; | 286 | interrupts = <76 2>; |
| 287 | }; | 287 | }; |
| 288 | dma01: dma-channel@80 { | 288 | dma01: dma-channel@80 { |
| 289 | compatible = "fsl,eloplus-dma-channel"; | 289 | compatible = "fsl,ssi-dma-channel"; |
| 290 | reg = <0x80 0x80>; | 290 | reg = <0x80 0x80>; |
| 291 | cell-index = <1>; | 291 | cell-index = <1>; |
| 292 | interrupts = <77 2>; | 292 | interrupts = <77 2>; |