Merge branch 'autofs' (patches from Ian Kent)

[karo-tx-linux.git] / drivers / uio / uio_pruss.c

diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index f8738de342befce9a8853bc4e5937f2d62f66aac..6e2ab007fe9c03fc7768bf84144155f73e1bd871 100644 (file)
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -115,7 +115,7 @@ static void pruss_cleanup(struct platform_device *dev,
        kfree(gdev);
 }
 
-static int __devinit pruss_probe(struct platform_device *dev)
+static int pruss_probe(struct platform_device *dev)
 {
        struct uio_info *p;
        struct uio_pruss_dev *gdev;
@@ -219,7 +219,7 @@ out_free:
        return ret;
 }
 
-static int __devexit pruss_remove(struct platform_device *dev)
+static int pruss_remove(struct platform_device *dev)
 {
        struct uio_pruss_dev *gdev = platform_get_drvdata(dev);
 
@@ -230,7 +230,7 @@ static int __devexit pruss_remove(struct platform_device *dev)
 
 static struct platform_driver pruss_driver = {
        .probe = pruss_probe,
-       .remove = __devexit_p(pruss_remove),
+       .remove = pruss_remove,
        .driver = {
                   .name = DRV_NAME,
                   .owner = THIS_MODULE,