From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Aug 2010 00:07:31 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.36-rc1~493
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faa38b5e0e092914764cdba9f83d31a3f794d182;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)
  ALSA: hda - Add pin-fix for HP dc5750
  ALSA: als4000: Fix potentially invalid DMA mode setup
  ALSA: als4000: enable burst mode
  ALSA: hda - Fix initial capsrc selection in patch_alc269()
  ASoC: TWL4030: Capture route runtime DAPM ordering fix
  ALSA: hda - Add PC-beep whitelist for an Intel board
  ALSA: hda - More relax for pending period handling
  ALSA: hda - Define AC_FMT_* constants
  ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
  ALSA: hda - Add support for HDMI HBR passthrough
  ALSA: hda - Set Stream Type in Stream Format according to AES0
  ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
  ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
  ASoC: wm9081: fix resource reclaim in wm9081_register error path
  ASoC: wm8978: fix a memory leak if a wm8978_register fail
  ASoC: wm8974: fix a memory leak if another WM8974 is registered
  ASoC: wm8961: fix resource reclaim in wm8961_register error path
  ASoC: wm8955: fix resource reclaim in wm8955_register error path
  ASoC: wm8940: fix a memory leak if wm8940_register return error
  ASoC: wm8904: fix resource reclaim in wm8904_register error path
  ...
---

faa38b5e0e092914764cdba9f83d31a3f794d182
diff --cc arch/arm/mach-kirkwood/common.h
index 5b2c1c1,c9ab1cb3..95bb0a7
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@@ -17,10 -17,8 +17,11 @@@ struct mv_sata_platform_data
  struct mvsdio_platform_data;
  struct mtd_partition;
  struct mtd_info;
+ struct kirkwood_asoc_platform_data;
  
 +#define KW_PCIE0	(1 << 0)
 +#define KW_PCIE1	(1 << 1)
 +
  /*
   * Basic Kirkwood init functions used early by machine-setup.
   */