1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 53d3770a0b1b..033f3f4c20ad 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -27,9 +27,9 @@
 #include <linux/libata.h>
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
+#include <linux/platform_data/atmel.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/board.h>
 #include <asm/gpio.h>
 
 #define DRV_NAME                "pata_at91"
@@ -313,7 +313,7 @@ static struct ata_port_operations pata_at91_port_ops = {
         .cable_detect   = ata_cable_40wire,
 };
 
-static int __devinit pata_at91_probe(struct platform_device *pdev)
+static int pata_at91_probe(struct platform_device *pdev)
 {
         struct at91_cf_data *board = pdev->dev.platform_data;
         struct device *dev = &pdev->dev;
@@ -420,7 +420,7 @@ err_put:
         return ret;
 }
 
-static int __devexit pata_at91_remove(struct platform_device *pdev)
+static int pata_at91_remove(struct platform_device *pdev)
 {
         struct ata_host *host = dev_get_drvdata(&pdev->dev);
         struct at91_ide_info *info;
@@ -441,7 +441,7 @@ static int __devexit pata_at91_remove(struct platform_device *pdev)
 
 static struct platform_driver pata_at91_driver = {
         .probe          = pata_at91_probe,
-        .remove         = __devexit_p(pata_at91_remove),
+        .remove         = pata_at91_remove,
         .driver         = {
                 .name           = DRV_NAME,
                 .owner          = THIS_MODULE,