diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /arch/powerpc/boot/dts/mpc8544ds.dts | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8544ds.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8544ds.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index b9da42105066..0668d1048779 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
| @@ -313,7 +313,7 @@ | |||
| 313 | 0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>; | 313 | 0x1000000 0x0 0x0 0xe1010000 0x0 0x10000>; |
| 314 | clock-frequency = <33333333>; | 314 | clock-frequency = <33333333>; |
| 315 | interrupt-parent = <&mpic>; | 315 | interrupt-parent = <&mpic>; |
| 316 | interrupts = <26 2>; | 316 | interrupts = <25 2>; |
| 317 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; | 317 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; |
| 318 | interrupt-map = < | 318 | interrupt-map = < |
| 319 | /* IDSEL 0x0 */ | 319 | /* IDSEL 0x0 */ |
| @@ -350,7 +350,7 @@ | |||
| 350 | 0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>; | 350 | 0x1000000 0x0 0x0 0xe1020000 0x0 0x10000>; |
| 351 | clock-frequency = <33333333>; | 351 | clock-frequency = <33333333>; |
| 352 | interrupt-parent = <&mpic>; | 352 | interrupt-parent = <&mpic>; |
| 353 | interrupts = <25 2>; | 353 | interrupts = <26 2>; |
| 354 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; | 354 | interrupt-map-mask = <0xf800 0x0 0x0 0x7>; |
| 355 | interrupt-map = < | 355 | interrupt-map = < |
| 356 | /* IDSEL 0x0 */ | 356 | /* IDSEL 0x0 */ |