git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into devel
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
pxa
/
pxa2xx-ac97.c
diff --git
a/sound/soc/pxa/pxa2xx-ac97.c
b/sound/soc/pxa/pxa2xx-ac97.c
index 01c21c6cdbbc2dd815f944f1b2df351f2b10ebec..d9c94d71fa617dcb859a3f396868b135cf67b645 100644
(file)
--- a/
sound/soc/pxa/pxa2xx-ac97.c
+++ b/
sound/soc/pxa/pxa2xx-ac97.c
@@
-20,8
+20,8
@@
#include <sound/pxa2xx-lib.h>
#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
#include <mach/regs-ac97.h>
+#include <mach/dma.h>
#include "pxa2xx-pcm.h"
#include "pxa2xx-ac97.h"