diff options
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c index 3dbc7f7cd7b9..e2ee220bfb7e 100644 --- a/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/sound/soc/fsl/mpc5200_psc_ac97.c | |||
@@ -317,12 +317,12 @@ static struct of_device_id psc_ac97_match[] __devinitdata = { | |||
317 | MODULE_DEVICE_TABLE(of, psc_ac97_match); | 317 | MODULE_DEVICE_TABLE(of, psc_ac97_match); |
318 | 318 | ||
319 | static struct of_platform_driver psc_ac97_driver = { | 319 | static struct of_platform_driver psc_ac97_driver = { |
320 | .match_table = psc_ac97_match, | ||
321 | .probe = psc_ac97_of_probe, | 320 | .probe = psc_ac97_of_probe, |
322 | .remove = __devexit_p(psc_ac97_of_remove), | 321 | .remove = __devexit_p(psc_ac97_of_remove), |
323 | .driver = { | 322 | .driver = { |
324 | .name = "mpc5200-psc-ac97", | 323 | .name = "mpc5200-psc-ac97", |
325 | .owner = THIS_MODULE, | 324 | .owner = THIS_MODULE, |
325 | .of_match_table = psc_ac97_match, | ||
326 | }, | 326 | }, |
327 | }; | 327 | }; |
328 | 328 | ||
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index 748cc0f0df38..4f455bd6851f 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
@@ -220,12 +220,12 @@ static struct of_device_id psc_i2s_match[] __devinitdata = { | |||
220 | MODULE_DEVICE_TABLE(of, psc_i2s_match); | 220 | MODULE_DEVICE_TABLE(of, psc_i2s_match); |
221 | 221 | ||
222 | static struct of_platform_driver psc_i2s_driver = { | 222 | static struct of_platform_driver psc_i2s_driver = { |
223 | .match_table = psc_i2s_match, | ||
224 | .probe = psc_i2s_of_probe, | 223 | .probe = psc_i2s_of_probe, |
225 | .remove = __devexit_p(psc_i2s_of_remove), | 224 | .remove = __devexit_p(psc_i2s_of_remove), |
226 | .driver = { | 225 | .driver = { |
227 | .name = "mpc5200-psc-i2s", | 226 | .name = "mpc5200-psc-i2s", |
228 | .owner = THIS_MODULE, | 227 | .owner = THIS_MODULE, |
228 | .of_match_table = psc_i2s_match, | ||
229 | }, | 229 | }, |
230 | }; | 230 | }; |
231 | 231 | ||
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index e3f78f255a60..6a2764ee8203 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c | |||
@@ -580,9 +580,11 @@ static struct of_device_id mpc8610_hpcd_match[] = { | |||
580 | MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match); | 580 | MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match); |
581 | 581 | ||
582 | static struct of_platform_driver mpc8610_hpcd_of_driver = { | 582 | static struct of_platform_driver mpc8610_hpcd_of_driver = { |
583 | .owner = THIS_MODULE, | 583 | .driver = { |
584 | .name = "mpc8610_hpcd", | 584 | .name = "mpc8610_hpcd", |
585 | .match_table = mpc8610_hpcd_match, | 585 | .owner = THIS_MODULE, |
586 | .of_match_table = mpc8610_hpcd_match, | ||
587 | }, | ||
586 | .probe = mpc8610_hpcd_probe, | 588 | .probe = mpc8610_hpcd_probe, |
587 | .remove = mpc8610_hpcd_remove, | 589 | .remove = mpc8610_hpcd_remove, |
588 | }; | 590 | }; |