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

[can-eth-gw-linux.git] / sound / soc / pxa / brownstone.c

diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 5e666e03d3331d39921a95bee2b5dc5e13c55230..4ad76099dd43fdec0d9e7262db77f1e07cd20713 100644 (file)
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -140,7 +140,7 @@ static struct snd_soc_card brownstone = {
        .num_dapm_routes = ARRAY_SIZE(brownstone_audio_map),
 };
 
-static int __devinit brownstone_probe(struct platform_device *pdev)
+static int brownstone_probe(struct platform_device *pdev)
 {
        int ret;
 
@@ -152,7 +152,7 @@ static int __devinit brownstone_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int __devexit brownstone_remove(struct platform_device *pdev)
+static int brownstone_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_card(&brownstone);
        return 0;
@@ -164,7 +164,7 @@ static struct platform_driver mmp_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = brownstone_probe,
-       .remove         = __devexit_p(brownstone_remove),
+       .remove         = brownstone_remove,
 };
 
 module_platform_driver(mmp_driver);