git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/asoc' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
soc
/
pxa
/
pxa-ssp.c
diff --git
a/sound/soc/pxa/pxa-ssp.c
b/sound/soc/pxa/pxa-ssp.c
index
152118c
..
de22544
100644
(file)
--- a/
sound/soc/pxa/pxa-ssp.c
+++ b/
sound/soc/pxa/pxa-ssp.c
@@
-30,7
+30,7
@@
#include <sound/pxa2xx-lib.h>
#include <mach/hardware.h>
-#include <mach/
pxa-regs
.h>
+#include <mach/
dma
.h>
#include <mach/regs-ssp.h>
#include <mach/audio.h>
#include <mach/ssp.h>