diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
| commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
| tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /sound/soc/imx/imx-audmux.c | |
| parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
| parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) | |
| download | op-kernel-dev-828006de1bddf83b6ecf03ec459c15f7c7c22db7.zip op-kernel-dev-828006de1bddf83b6ecf03ec459c15f7c7c22db7.tar.gz | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
Diffstat (limited to 'sound/soc/imx/imx-audmux.c')
| -rw-r--r-- | sound/soc/imx/imx-audmux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/imx/imx-audmux.c b/sound/soc/imx/imx-audmux.c index b83699d..a839494 100644 --- a/sound/soc/imx/imx-audmux.c +++ b/sound/soc/imx/imx-audmux.c @@ -167,7 +167,7 @@ static void __init audmux_debugfs_init(void) } } -static void __exit audmux_debugfs_remove(void) +static void __devexit audmux_debugfs_remove(void) { debugfs_remove_recursive(audmux_debugfs_root); } @@ -249,7 +249,7 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, } EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); -static int __init imx_audmux_probe(struct platform_device *pdev) +static int __devinit imx_audmux_probe(struct platform_device *pdev) { struct resource *res; const struct of_device_id *of_id = @@ -276,7 +276,7 @@ static int __init imx_audmux_probe(struct platform_device *pdev) return 0; } -static int __exit imx_audmux_remove(struct platform_device *pdev) +static int __devexit imx_audmux_remove(struct platform_device *pdev) { if (audmux_type == IMX31_AUDMUX) audmux_debugfs_remove(); @@ -287,7 +287,7 @@ static int __exit imx_audmux_remove(struct platform_device *pdev) static struct platform_driver imx_audmux_driver = { .probe = imx_audmux_probe, - .remove = __exit_p(imx_audmux_remove), + .remove = __devexit_p(imx_audmux_remove), .id_table = imx_audmux_ids, .driver = { .name = DRIVER_NAME, |
