Merge branch 'master' of /repos/git/net-next-2.6

[pandora-kernel.git] / include / linux / ahci_platform.h

diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index f7dd576..be3d9a7 100644 (file)
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -15,11 +15,13 @@
 #ifndef _AHCI_PLATFORM_H
 #define _AHCI_PLATFORM_H
 
+#include <linux/compiler.h>
+
 struct device;
 struct ata_port_info;
 
 struct ahci_platform_data {
-       int (*init)(struct device *dev);
+       int (*init)(struct device *dev, void __iomem *addr);
        void (*exit)(struct device *dev);
        const struct ata_port_info *ata_port_info;
        unsigned int force_port_map;