Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[can-eth-gw-linux.git] / drivers / misc / atmel-ssc.c

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index d07a9eda7fff4a29aebc43892658b339b4ebb196..158da5a81a661824a2dca0ee2a9fe93fb5cacfb6 100644 (file)
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -189,7 +189,7 @@ static int ssc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit ssc_remove(struct platform_device *pdev)
+static int ssc_remove(struct platform_device *pdev)
 {
        struct ssc_device *ssc = platform_get_drvdata(pdev);
 
@@ -208,7 +208,7 @@ static struct platform_driver ssc_driver = {
        },
        .id_table       = atmel_ssc_devtypes,
        .probe          = ssc_probe,
-       .remove         = __devexit_p(ssc_remove),
+       .remove         = ssc_remove,
 };
 module_platform_driver(ssc_driver);