diff --git a/[refs] b/[refs]
index e7a4007048e0..dc570cbef9aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166a2967b45ede2e2e56f3ede3cd32053dc17812
+refs/heads/master: e91df93ebd7bef40d175d51ab7bcbd3b5c4fc212
diff --git a/trunk/drivers/ata/libata.h b/trunk/drivers/ata/libata.h
index 44a7939b5bb6..50e4dff0604e 100644
--- a/trunk/drivers/ata/libata.h
+++ b/trunk/drivers/ata/libata.h
@@ -131,9 +131,9 @@ static inline void ata_acpi_on_disable(struct ata_device *dev) { }
 static inline void ata_acpi_set_state(struct ata_port *ap,
 				      pm_message_t state) { }
 static inline int ata_acpi_register(void) { return 0; }
-static void ata_acpi_unregister(void) { }
-static void ata_acpi_bind(struct ata_device *dev) { }
-static void ata_acpi_unbind(struct ata_device *dev) { }
+static inline void ata_acpi_unregister(void) { }
+static inline void ata_acpi_bind(struct ata_device *dev) { }
+static inline void ata_acpi_unbind(struct ata_device *dev) { }
 #endif
 
 /* libata-scsi.c */