From: Mark Brown <broonie@linaro.org>
Date: Tue, 3 Jun 2014 09:39:52 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b12a1906be48d1d020e1e20550b93417c7c3d767;p=linux.git

Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into asoc-next
---

b12a1906be48d1d020e1e20550b93417c7c3d767
diff --cc sound/soc/codecs/max98090.c
index 9b76f5a451151,8857be798f3b2,f7b0b37aa8582..f5fccc7a8e89b
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@ -16,7 -15,8 -15,6 +16,8 @@@@
   #include <linux/pm_runtime.h>
   #include <linux/regmap.h>
   #include <linux/slab.h>
  +#include <linux/acpi.h>
+ +#include <linux/clk.h>
   #include <sound/jack.h>
   #include <sound/pcm.h>
   #include <sound/pcm_params.h>