diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 21:43:40 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 21:43:40 +0100 |
commit | 4e25d30c8ddeae6ad0b68440aacadaacb14f8538 (patch) | |
tree | 08fe4ac15aec508b370262ad653c83a91be247b5 /sound/soc/pxa/em-x270.c | |
parent | d2bb390a2081a36ffe906724d2848d846f2aeb29 (diff) | |
parent | 141dee78c40ac2c43aa4ff306688d625e1c731de (diff) | |
download | linux-4e25d30c8ddeae6ad0b68440aacadaacb14f8538.tar.bz2 |
Merge tag 'asoc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.11
Another release that's mainly focused on drivers rather than core
changes, highlights include:
- A huge batch of updates to the Intel drivers, mainly around
DisplayPort and HDMI with some additional board support too.
- Channel mapping support for HDMI.
- Support for AllWinner A31 and A33, Everest Semiconductor ES8328,
Nuvoton NAU8540.
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
-rw-r--r-- | sound/soc/pxa/em-x270.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index 966163d1c813..6f2020f6c8d3 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -30,8 +30,6 @@ #include <asm/mach-types.h> #include <mach/audio.h> -#include "pxa2xx-ac97.h" - static struct snd_soc_dai_link em_x270_dai[] = { { .name = "AC97", |