Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 08cfaf6fb399431466f6d702291ea446822e37eb..b5d0088f3102a4fb52062a5a4d528634b77eaa7b 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int hardware_init_port(void)
        return 0;
 }
 
-static int __devinit lirc_serial_probe(struct platform_device *dev)
+static int lirc_serial_probe(struct platform_device *dev)
 {
        int i, nlow, nhigh, result;
 
@@ -927,7 +927,7 @@ exit_free_irq:
        return result;
 }
 
-static int __devexit lirc_serial_remove(struct platform_device *dev)
+static int lirc_serial_remove(struct platform_device *dev)
 {
        free_irq(irq, (void *)&hardware);
 
@@ -1148,7 +1148,7 @@ static int lirc_serial_resume(struct platform_device *dev)
 
 static struct platform_driver lirc_serial_driver = {
        .probe          = lirc_serial_probe,
-       .remove         = __devexit_p(lirc_serial_remove),
+       .remove         = lirc_serial_remove,
        .suspend        = lirc_serial_suspend,
        .resume         = lirc_serial_resume,
        .driver         = {