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

[android-x86/kernel.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 513b75e..af08e67 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -835,7 +835,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;
 
@@ -916,7 +916,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);
 
@@ -1137,7 +1137,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         = {