diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:43:22 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 21:43:22 +0200 |
commit | 32d80f97fe4a86b7e9de5d13030432de115119b1 (patch) | |
tree | 54b95741024e8926348fa15d43579d49f4743553 /sound/soc/omap/mcpdm.c | |
parent | 3a3ad60176fafb027bf2e4fe4793eab99ced5708 (diff) | |
parent | 100aafc992039794d0facb0e7bbd02f8a11fd1d6 (diff) | |
download | op-kernel-dev-32d80f97fe4a86b7e9de5d13030432de115119b1.zip op-kernel-dev-32d80f97fe4a86b7e9de5d13030432de115119b1.tar.gz |
Merge branch 'imx/fixes' into next/fixes
Diffstat (limited to 'sound/soc/omap/mcpdm.c')
-rw-r--r-- | sound/soc/omap/mcpdm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/mcpdm.c b/sound/soc/omap/mcpdm.c index 928f037..50e5919 100644 --- a/sound/soc/omap/mcpdm.c +++ b/sound/soc/omap/mcpdm.c @@ -449,7 +449,7 @@ exit: return ret; } -int __devexit omap_mcpdm_remove(struct platform_device *pdev) +int omap_mcpdm_remove(struct platform_device *pdev) { struct omap_mcpdm *mcpdm_ptr = platform_get_drvdata(pdev); |