diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/powerpc/boot/dts/canyonlands.dts | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/powerpc/boot/dts/canyonlands.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index cd56bb5b347b..5806ef0b860b 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
| @@ -270,7 +270,7 @@ | |||
| 270 | clock-frequency = <0>; /* Filled in by U-Boot */ | 270 | clock-frequency = <0>; /* Filled in by U-Boot */ |
| 271 | current-speed = <0>; /* Filled in by U-Boot */ | 271 | current-speed = <0>; /* Filled in by U-Boot */ |
| 272 | interrupt-parent = <&UIC1>; | 272 | interrupt-parent = <&UIC1>; |
| 273 | interrupts = <0x1d 0x4>; | 273 | interrupts = <28 0x4>; |
| 274 | }; | 274 | }; |
| 275 | 275 | ||
| 276 | UART3: serial@ef600600 { | 276 | UART3: serial@ef600600 { |
| @@ -281,7 +281,7 @@ | |||
| 281 | clock-frequency = <0>; /* Filled in by U-Boot */ | 281 | clock-frequency = <0>; /* Filled in by U-Boot */ |
| 282 | current-speed = <0>; /* Filled in by U-Boot */ | 282 | current-speed = <0>; /* Filled in by U-Boot */ |
| 283 | interrupt-parent = <&UIC1>; | 283 | interrupt-parent = <&UIC1>; |
| 284 | interrupts = <0x1e 0x4>; | 284 | interrupts = <29 0x4>; |
| 285 | }; | 285 | }; |
| 286 | 286 | ||
| 287 | IIC0: i2c@ef600700 { | 287 | IIC0: i2c@ef600700 { |