diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:13 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:13 +0100 |
commit | df00b71fbd5efde56e521bd220a7483b1c15c4be (patch) | |
tree | 6433abc3c35e1b709120428619fed01b98beca09 /sound/soc/samsung/s3c24xx-i2s.c | |
parent | 8c7df02167854288e20f76915348ffdc9a11e5c2 (diff) | |
parent | 32873b595371acec3a7c5cd225e266d8426e087f (diff) | |
download | op-kernel-dev-df00b71fbd5efde56e521bd220a7483b1c15c4be.zip op-kernel-dev-df00b71fbd5efde56e521bd220a7483b1c15c4be.tar.gz |
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
Diffstat (limited to 'sound/soc/samsung/s3c24xx-i2s.c')
-rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 5403176..8b34145 100644 --- 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" |