diff options
| author | Takashi Iwai | 2013-12-04 12:40:59 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2013-12-04 12:40:59 +0100 |
| commit | b0e6989c965dda2f2b65a2abb04f5337b497f4a2 (patch) | |
| tree | eb70ca5f8fc50688f879d1c851fa3f09a6c68850 /arch/powerpc/boot/dts/xpedite5330.dts | |
| parent | ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/atmel', 'asoc/fi... (diff) | |
| download | kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.tar.gz kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.tar.xz kernel-qcow2-linux-b0e6989c965dda2f2b65a2abb04f5337b497f4a2.zip | |
Merge tag 'asoc-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A smattering of fixes here, some core ones for the rate combination
issues for things other than simple bitmasks, for readback of byte
controls and for updating the power of value muxes plus a bunch of
driver fixes of varying severity.
The warning fix in the i.MX FIQ driver is fixing a warning introduced
by a previous fix.
Diffstat (limited to 'arch/powerpc/boot/dts/xpedite5330.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/xpedite5330.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/xpedite5330.dts b/arch/powerpc/boot/dts/xpedite5330.dts index 215225983150..73f8620f1ce7 100644 --- a/arch/powerpc/boot/dts/xpedite5330.dts +++ b/arch/powerpc/boot/dts/xpedite5330.dts @@ -583,14 +583,14 @@ tlu@2f000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x2f000 0x1000>; - interupts = <61 2 >; + interrupts = <61 2>; interrupt-parent = <&mpic>; }; tlu@15000 { compatible = "fsl,mpc8572-tlu", "fsl_tlu"; reg = <0x15000 0x1000>; - interupts = <75 2>; + interrupts = <75 2>; interrupt-parent = <&mpic>; }; }; |