git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'regmap-linus' and 'regmap-interface' into regmap-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5pv210
/
dev-audio.c
diff --git
a/arch/arm/mach-s5pv210/dev-audio.c
b/arch/arm/mach-s5pv210/dev-audio.c
index
8d58f19
..
63f5d82
100644
(file)
--- a/
arch/arm/mach-s5pv210/dev-audio.c
+++ b/
arch/arm/mach-s5pv210/dev-audio.c
@@
-18,6
+18,7
@@
#include <mach/map.h>
#include <mach/dma.h>
#include <mach/irqs.h>
#include <mach/map.h>
#include <mach/dma.h>
#include <mach/irqs.h>
+#include <mach/regs-audss.h>
static const char *rclksrc[] = {
[0] = "busclk",
static const char *rclksrc[] = {
[0] = "busclk",
@@
-52,6
+53,7
@@
static struct s3c_audio_pdata i2sv5_pdata = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
| QUIRK_NEED_RSTCLR,
.src_clk = rclksrc,
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
| QUIRK_NEED_RSTCLR,
.src_clk = rclksrc,
+ .idma_addr = S5PV210_AUDSS_INT_MEM,
},
},
};
},
},
};