projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
[linux-2.6-block.git]
/
sound
/
soc
/
samsung
/
s3c24xx-i2s.c
diff --git
a/sound/soc/samsung/s3c24xx-i2s.c
b/sound/soc/samsung/s3c24xx-i2s.c
index 5403176b2aa39519283cd31bbbff7c15d7ac7023..8b3414551a6231ffe6556989570831dd46c15dc7 100644
(file)
--- a/
sound/soc/samsung/s3c24xx-i2s.c
+++ b/
sound/soc/samsung/s3c24xx-i2s.c
@@
-24,7
+24,7
@@
#include <sound/pcm_params.h>
#include <mach/dma.h>
-#include
<plat/regs-iis.h>
+#include
"regs-iis.h"
#include "dma.h"
#include "s3c24xx-i2s.h"