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-i2s.c
diff --git
a/sound/soc/pxa/pxa2xx-i2s.c
b/sound/soc/pxa/pxa2xx-i2s.c
index e6c24408c5f9fb23714b22173e2b1fad8a8877d8..2f4b6e489b7849a68eae4a76e4bb011c92bef129 100644
(file)
--- a/
sound/soc/pxa/pxa2xx-i2s.c
+++ b/
sound/soc/pxa/pxa2xx-i2s.c
@@
-24,7
+24,7
@@
#include <sound/pxa2xx-lib.h>
#include <mach/hardware.h>
-#include <mach/
pxa-regs
.h>
+#include <mach/
dma
.h>
#include <mach/audio.h>
#include "pxa2xx-pcm.h"