From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 20 May 2010 10:00:43 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.35-rc1~478^2
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=d71f4cece4bd97d05592836202fc04ff2e7817e3

Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c
---

d71f4cece4bd97d05592836202fc04ff2e7817e3
diff --cc sound/soc/codecs/tlv320aic3x.c
index 4a6d56c,eafa164..71a6990
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -38,8 -38,9 +38,10 @@@
  #include <linux/delay.h>
  #include <linux/pm.h>
  #include <linux/i2c.h>
+ #include <linux/gpio.h>
+ #include <linux/regulator/consumer.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
diff --cc sound/soc/codecs/wm8903.c
index fa5f99f,05b28cf..bf08282
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@@ -23,8 -22,8 +22,9 @@@
  #include <linux/pm.h>
  #include <linux/i2c.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
+ #include <sound/jack.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
  #include <sound/tlv.h>