]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ASoC: omap_mcpdm_remove cannot be __devexit
authorArnd Bergmann <arnd@arndb.de>
Sun, 2 Oct 2011 14:45:31 +0000 (16:45 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:19:59 +0000 (20:19 +0100)
omap_mcpdm_remove is used from asoc_mcpdm_probe, which is an
initcall, and must not be discarded when HOTPLUG is disabled.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h

index 928f03707451ecde15f046574ed8f1b4e841ee9a..50e59194ad81638affb5b73dec62b7a956256053 100644 (file)
@@ -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);
 
index df3e16fb51f31ca2c6e1f25c9881ac272f7788c2..20c20a8649fe5251664aaba54945269fbc13d0e8 100644 (file)
@@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void);
 extern void omap_mcpdm_free(void);
 extern int omap_mcpdm_set_offset(int offset1, int offset2);
 int __devinit omap_mcpdm_probe(struct platform_device *pdev);
-int __devexit omap_mcpdm_remove(struct platform_device *pdev);
+int omap_mcpdm_remove(struct platform_device *pdev);