]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ASoC: Fix merge with PXA tree
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 11:23:32 +0000 (11:23 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Jan 2009 11:23:32 +0000 (11:23 +0000)
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>
sound/soc/pxa/e800_wm9712.c

index 78a1770b986c466602592a05c18e00a0bd98228a..bc019cdce42922c787f62dfd8bc30cd7a0582d25 100644 (file)
 #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"