Skip to contentSkip to conversation

Sound fixes for 3.8-rc7

GIT PULL Takashi Iwai 1 participant 1 message Feb 6, 2013

lore
Share & tools
lore
#0 lore raw

Linus,

The following changes since commit 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a:

ALSA: hda - Fix non-snoop page handling (2013-01-29 18:18:00 +0100)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.8

for you to fetch changes up to 6baa4afa04a79d3a12558401cee0e39004ffcbcf:

Merge branch 'fix/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus-uncursed (2013-02-06 15:49:07 +0100)

----------------------------------------------------------------

Sound fixes for 3.8-rc7

Just a couple of build regression fixes for ASoC fsl stuff. It doesn't look too trivial, but neither intrusive, so hopefully I can avoid your curse...

----------------------------------------------------------------
Shawn Guo (2):
Revert "ASoC: fsl: fix multiple definition of init_module"
ASoC: fsl: fix snd-soc-imx-pcm module build

Takashi Iwai (1):
Merge branch 'fix/fsl' of git://git.kernel.org/.../broonie/sound into for-linus-uncursed

 sound/soc/fsl/Kconfig       |  9 +++++++--
 sound/soc/fsl/Makefile      |  5 +----
 sound/soc/fsl/imx-pcm-dma.c | 21 +--------------------
 sound/soc/fsl/imx-pcm-fiq.c | 22 +---------------------
 sound/soc/fsl/imx-pcm.c     | 35 +++++++++++++++++++++++++++++++++++
 sound/soc/fsl/imx-pcm.h     | 18 ++++++++++++++++++
 6 files changed, 63 insertions(+), 47 deletions(-)