diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /arch/powerpc/boot | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts index 9535ce68caae..83c3218cb4da 100644 --- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts +++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts | |||
| @@ -286,6 +286,7 @@ | |||
| 286 | 286 | ||
| 287 | ssi@16100 { | 287 | ssi@16100 { |
| 288 | compatible = "fsl,mpc8610-ssi"; | 288 | compatible = "fsl,mpc8610-ssi"; |
| 289 | status = "disabled"; | ||
| 289 | cell-index = <1>; | 290 | cell-index = <1>; |
| 290 | reg = <0x16100 0x100>; | 291 | reg = <0x16100 0x100>; |
| 291 | interrupt-parent = <&mpic>; | 292 | interrupt-parent = <&mpic>; |