diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 20:22:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-24 20:22:43 +0100 |
| commit | b42af319f26bcb7d84b42b4bd0ca3b84ba94b160 (patch) | |
| tree | 73b0fcf1e06f5d7e6d8f01476365b65c92d15bc5 | |
| parent | dff2836707a40868766ec37c0869ff60adfc5706 (diff) | |
| parent | 3bdf28feafc52864bd7f17b39deec64833a89d19 (diff) | |
| download | linux-b42af319f26bcb7d84b42b4bd0ca3b84ba94b160.tar.gz linux-b42af319f26bcb7d84b42b4bd0ca3b84ba94b160.tar.bz2 linux-b42af319f26bcb7d84b42b4bd0ca3b84ba94b160.zip | |
Merge branch 'for-3.1' into for-3.2
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 73a15888263b..3c9080f78266 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -420,7 +420,7 @@ static const char *sidetone_hpf_text[] = { }; 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[] = { "HiFi", "Custom", "Voice" diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index fd0dc46afc34..5c6c2457386e 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = { .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; struct psc_dma *psc_dma; @@ -487,7 +487,7 @@ out_unmap: 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); @@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match); static struct platform_driver mpc5200_hpcd_of_driver = { .probe = mpc5200_hpcd_probe, .remove = mpc5200_hpcd_remove, - .dev = { + .driver = { .owner = THIS_MODULE, .name = "mpc5200-pcm-audio", .of_match_table = mpc5200_hpcd_match, |