unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

ASoC: Fix merge with PXA tree

Browse source 
Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2009-01-23 11:23:32 +00:00
parent ff637d38ea
commit c91cf25ebf
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sound/soc/pxa/e800_wm9712.c
View file

@ -18,13 +18,10 @@
#include <sound/soc.h>
#include <sound/soc-dapm.h>
#include <mach/pxa-regs.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <mach/audio.h>
#include <mach/eseries-gpio.h>
#include <asm/mach-types.h>
#include "../codecs/wm9712.h"
#include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h"