diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-11-22 01:36:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 09:06:27 -0500 |
commit | 158a782843f9b0716c9fecf14a0563b07cf84da4 (patch) | |
tree | 19bbb10a8be71335e3b1e968f15e7089f9872327 /sound/soc/s3c24xx | |
parent | 99ce3a3f3748f39ab6447c246b675f182ee761da (diff) |
ASoC: Samsung: Rename PCM driver
Rename Samsung PCM Controller driver
s3c-pcm.[c/h] -> pcm.[c/h]
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/Makefile | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/pcm.c (renamed from sound/soc/s3c24xx/s3c-pcm.c) | 4 | ||||
-rw-r--r-- | sound/soc/s3c24xx/pcm.h (renamed from sound/soc/s3c24xx/s3c-pcm.h) | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 551a63d65d73..93de2a00df1f 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile | |||
@@ -6,8 +6,8 @@ snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o | |||
6 | snd-soc-ac97-objs := ac97.o | 6 | snd-soc-ac97-objs := ac97.o |
7 | snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o | 7 | snd-soc-s3c64xx-i2s-v4-objs := s3c64xx-i2s-v4.o |
8 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o | 8 | snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o |
9 | snd-soc-s3c-pcm-objs := s3c-pcm.o | ||
10 | snd-soc-samsung-spdif-objs := spdif.o | 9 | snd-soc-samsung-spdif-objs := spdif.o |
10 | snd-soc-pcm-objs := pcm.o | ||
11 | 11 | ||
12 | obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o | 12 | obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o |
13 | obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o | 13 | obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o |
@@ -16,8 +16,8 @@ obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o | |||
16 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o | 16 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o |
17 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o | 17 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S_V4) += snd-soc-s3c64xx-i2s-v4.o |
18 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o | 18 | obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o |
19 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o | ||
20 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o | 19 | obj-$(CONFIG_SND_S5P_SOC_SPDIF) += snd-soc-samsung-spdif.o |
20 | obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-pcm.o | ||
21 | 21 | ||
22 | # S3C24XX Machine Support | 22 | # S3C24XX Machine Support |
23 | snd-soc-jive-wm8750-objs := jive_wm8750.o | 23 | snd-soc-jive-wm8750-objs := jive_wm8750.o |
diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/pcm.c index e111d23f8886..4d0f6e4f65bc 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/pcm.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* sound/soc/s3c24xx/s3c-pcm.c | 1 | /* sound/soc/s3c24xx/pcm.c |
2 | * | 2 | * |
3 | * ALSA SoC Audio Layer - S3C PCM-Controller driver | 3 | * ALSA SoC Audio Layer - S3C PCM-Controller driver |
4 | * | 4 | * |
@@ -30,7 +30,7 @@ | |||
30 | #include <plat/dma.h> | 30 | #include <plat/dma.h> |
31 | 31 | ||
32 | #include "dma.h" | 32 | #include "dma.h" |
33 | #include "s3c-pcm.h" | 33 | #include "pcm.h" |
34 | 34 | ||
35 | static struct s3c2410_dma_client s3c_pcm_dma_client_out = { | 35 | static struct s3c2410_dma_client s3c_pcm_dma_client_out = { |
36 | .name = "PCM Stereo out" | 36 | .name = "PCM Stereo out" |
diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/pcm.h index f60baa19387d..3775216ffda8 100644 --- a/sound/soc/s3c24xx/s3c-pcm.h +++ b/sound/soc/s3c24xx/pcm.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* sound/soc/s3c24xx/s3c-pcm.h | 1 | /* sound/soc/s3c24xx/pcm.h |
2 | * | 2 | * |
3 | * This program is free software; you can redistribute it and/or modify | 3 | * This program is free software; you can redistribute it and/or modify |
4 | * it under the terms of the GNU General Public License version 2 as | 4 | * it under the terms of the GNU General Public License version 2 as |