From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 27 Apr 2010 13:36:17 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-next
X-Git-Tag: next-20110726~34^2~678
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30031eb82c379eef4e2ef9b191b35dc0f53d1d43;p=karo-tx-linux.git

Merge branch 'topic/asoc' into for-next
---

30031eb82c379eef4e2ef9b191b35dc0f53d1d43
diff --cc sound/soc/codecs/tlv320aic3x.c
index 5be580e88344,584bc1e67f76..b2c279425993
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -38,8 -38,8 +38,9 @@@
  #include <linux/delay.h>
  #include <linux/pm.h>
  #include <linux/i2c.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>