Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 148178
b: refs/heads/master
c: 4b166da
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Glöckner authored and Mark Brown committed Apr 4, 2009
1 parent 501b253 commit 2376850
Show file tree
Hide file tree
Showing 18 changed files with 1,208 additions and 1,214 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5409fb4e327a84972483047ecf4fb41f279453e2
refs/heads/master: 4b166da939012905f4c36fedada62067db31948e
1 change: 0 additions & 1 deletion trunk/include/sound/soc-dai.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ struct snd_soc_dai {
/* DAI capabilities */
struct snd_soc_pcm_stream capture;
struct snd_soc_pcm_stream playback;
unsigned int symmetric_rates:1;

/* DAI runtime info */
struct snd_pcm_runtime *runtime;
Expand Down
6 changes: 0 additions & 6 deletions trunk/include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,6 @@ struct snd_soc_dai_link {
/* codec/machine specific init - e.g. add machine controls */
int (*init)(struct snd_soc_codec *codec);

/* Symmetry requirements */
unsigned int symmetric_rates:1;

/* Symmetry data - only valid if symmetry is being enforced */
unsigned int rate;

/* DAI pcm */
struct snd_pcm *pcm;
};
Expand Down
1 change: 1 addition & 0 deletions trunk/sound/soc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ source "sound/soc/fsl/Kconfig"
source "sound/soc/omap/Kconfig"
source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig"
source "sound/soc/s6000/Kconfig"
source "sound/soc/sh/Kconfig"

# Supported codecs
Expand Down
1 change: 1 addition & 0 deletions trunk/sound/soc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ obj-$(CONFIG_SND_SOC) += fsl/
obj-$(CONFIG_SND_SOC) += omap/
obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += s3c24xx/
obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/
4 changes: 0 additions & 4 deletions trunk/sound/soc/codecs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ config SND_SOC_ALL_CODECS
select SND_SOC_WM8900 if I2C
select SND_SOC_WM8903 if I2C
select SND_SOC_WM8971 if I2C
select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI
select SND_SOC_WM8990 if I2C
select SND_SOC_WM9705 if SND_SOC_AC97_BUS
select SND_SOC_WM9712 if SND_SOC_AC97_BUS
Expand Down Expand Up @@ -142,9 +141,6 @@ config SND_SOC_WM8903
config SND_SOC_WM8971
tristate

config SND_SOC_WM8988
tristate

config SND_SOC_WM8990
tristate

Expand Down
2 changes: 0 additions & 2 deletions trunk/sound/soc/codecs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ snd-soc-wm8753-objs := wm8753.o
snd-soc-wm8900-objs := wm8900.o
snd-soc-wm8903-objs := wm8903.o
snd-soc-wm8971-objs := wm8971.o
snd-soc-wm8988-objs := wm8988.o
snd-soc-wm8990-objs := wm8990.o
snd-soc-wm9705-objs := wm9705.o
snd-soc-wm9712-objs := wm9712.o
Expand Down Expand Up @@ -56,7 +55,6 @@ obj-$(CONFIG_SND_SOC_WM8753) += snd-soc-wm8753.o
obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o
obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o
obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o
obj-$(CONFIG_SND_SOC_WM8988) += snd-soc-wm8988.o
obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o
obj-$(CONFIG_SND_SOC_WM8991) += snd-soc-wm8991.o
obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
Expand Down
3 changes: 1 addition & 2 deletions trunk/sound/soc/codecs/ak4535.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,7 @@ static int ak4535_remove(struct platform_device *pdev)
snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
if (codec->control_data)
i2c_unregister_device(codec->control_data);
i2c_unregister_device(codec->control_data);
i2c_del_driver(&ak4535_i2c_driver);
#endif
kfree(codec->private_data);
Expand Down
Loading

0 comments on commit 2376850

Please sign in to comment.