Merge tag 'v3.8-rc1' into staging/for_v3.9

[platform/kernel/linux-exynos.git] / drivers / staging / media / lirc / lirc_parallel.c

diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c
index 139920c..41d110f 100644 (file)
--- a/drivers/staging/media/lirc/lirc_parallel.c
+++ b/drivers/staging/media/lirc/lirc_parallel.c
@@ -577,12 +577,12 @@ static struct lirc_driver driver = {
 
 static struct platform_device *lirc_parallel_dev;
 
-static int __devinit lirc_parallel_probe(struct platform_device *dev)
+static int lirc_parallel_probe(struct platform_device *dev)
 {
        return 0;
 }
 
-static int __devexit lirc_parallel_remove(struct platform_device *dev)
+static int lirc_parallel_remove(struct platform_device *dev)
 {
        return 0;
 }
@@ -600,7 +600,7 @@ static int lirc_parallel_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_parallel_driver = {
        .probe  = lirc_parallel_probe,
-       .remove = __devexit_p(lirc_parallel_remove),
+       .remove = lirc_parallel_remove,
        .suspend        = lirc_parallel_suspend,
        .resume = lirc_parallel_resume,
        .driver = {