diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-09 10:58:30 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 10:58:30 +0100 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /sound/soc/codecs/max98357a.c | |
| parent | Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.xz linux-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.zip | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'sound/soc/codecs/max98357a.c')
| -rw-r--r-- | sound/soc/codecs/max98357a.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index 1806333ea29e..e9e6efbc21dd 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -12,9 +12,19 @@ * max98357a.c -- MAX98357A ALSA SoC Codec driver */ -#include <linux/module.h> +#include <linux/device.h> +#include <linux/err.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/kernel.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <sound/pcm.h> #include <sound/soc.h> +#include <sound/soc-dai.h> +#include <sound/soc-dapm.h> #define DRV_NAME "max98357a" |