From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 13 Apr 2010 10:57:59 +0000 (+0200)
Subject: Merge branch 'topic/core-cleanup' into for-next
X-Git-Tag: next-20110726~34^2~698
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e04201e9b28b1214bc19bdf7077af2206c4d29a9;p=karo-tx-linux.git

Merge branch 'topic/core-cleanup' into for-next

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

e04201e9b28b1214bc19bdf7077af2206c4d29a9
diff --cc sound/soc/codecs/wm8903.c
index 134b17532f23,fa5f99fde68b..e8eefd2b706b
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@@ -22,8 -23,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>