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

[~andy/linux] / drivers / media / rc / ir-rx51.c

diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 9e76c7b40af2f63430d69f25299307164b7daf17..31b955bf7664497ff967ab08e55271d99ca70eba 100644 (file)
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -443,7 +443,7 @@ static int lirc_rx51_resume(struct platform_device *dev)
 
 #endif /* CONFIG_PM */
 
-static int __devinit lirc_rx51_probe(struct platform_device *dev)
+static int lirc_rx51_probe(struct platform_device *dev)
 {
        lirc_rx51_driver.features = LIRC_RX51_DRIVER_FEATURES;
        lirc_rx51.pdata = dev->dev.platform_data;
@@ -464,14 +464,14 @@ static int __devinit lirc_rx51_probe(struct platform_device *dev)
        return 0;
 }
 
-static int __exit lirc_rx51_remove(struct platform_device *dev)
+static int lirc_rx51_remove(struct platform_device *dev)
 {
        return lirc_unregister_driver(lirc_rx51_driver.minor);
 }
 
 struct platform_driver lirc_rx51_platform_driver = {
        .probe          = lirc_rx51_probe,
-       .remove         = __exit_p(lirc_rx51_remove),
+       .remove         = lirc_rx51_remove,
        .suspend        = lirc_rx51_suspend,
        .resume         = lirc_rx51_resume,
        .driver         = {