lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-3.1' into for-3.2

Browse Source
This commit is contained in:
Mark Brown
2011-08-24 20:22:43 +01:00
parent dff2836707 3bdf28feaf
commit b42af319f2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/wm8996.c
View File

@@ -420,7 +420,7 @@ static const char *sidetone_hpf_text[] = {
}; };
static const struct soc_enum sidetone_hpf = static const struct soc_enum sidetone_hpf =
SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 6, sidetone_hpf_text); SOC_ENUM_SINGLE(WM8996_SIDETONE, 7, 7, sidetone_hpf_text);
static const char *hpf_mode_text[] = { static const char *hpf_mode_text[] = {
"HiFi", "Custom", "Voice" "HiFi", "Custom", "Voice"

6
sound/soc/fsl/mpc5200_dma.c
View File

@@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
.pcm_free = &psc_dma_free, .pcm_free = &psc_dma_free,
}; };
static int mpc5200_hpcd_probe(struct of_device *op) static int mpc5200_hpcd_probe(struct platform_device *op)
{ {
phys_addr_t fifo; phys_addr_t fifo;
struct psc_dma *psc_dma; struct psc_dma *psc_dma;
@@ -487,7 +487,7 @@ out_unmap:
return ret; return ret;
} }
static int mpc5200_hpcd_remove(struct of_device *op) static int mpc5200_hpcd_remove(struct platform_device *op)
{ {
struct psc_dma *psc_dma = dev_get_drvdata(&op->dev); struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
@@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
static struct platform_driver mpc5200_hpcd_of_driver = { static struct platform_driver mpc5200_hpcd_of_driver = {
.probe = mpc5200_hpcd_probe, .probe = mpc5200_hpcd_probe,
.remove = mpc5200_hpcd_remove, .remove = mpc5200_hpcd_remove,
.dev = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "mpc5200-pcm-audio", .name = "mpc5200-pcm-audio",
.of_match_table = mpc5200_hpcd_match, .of_match_table = mpc5200_hpcd_match,