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

[deliverable/linux.git] / drivers / staging / media / lirc / lirc_sir.c

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 9a88f057c0bda1d94ade25cf89610f5cd6978ee6..63a554c36f751034d053a45a60262163c5500b23 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -1213,19 +1213,19 @@ static int init_lirc_sir(void)
        return 0;
 }
 
-static int __devinit lirc_sir_probe(struct platform_device *dev)
+static int lirc_sir_probe(struct platform_device *dev)
 {
        return 0;
 }
 
-static int __devexit lirc_sir_remove(struct platform_device *dev)
+static int lirc_sir_remove(struct platform_device *dev)
 {
        return 0;
 }
 
 static struct platform_driver lirc_sir_driver = {
        .probe          = lirc_sir_probe,
-       .remove         = __devexit_p(lirc_sir_remove),
+       .remove         = lirc_sir_remove,
        .driver         = {
                .name   = "lirc_sir",
                .owner  = THIS_MODULE,