Automatic merge of /spare/repo/netdev-2.6 branch master

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 505160ab472b..1f7e2039a04e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -584,6 +584,13 @@ static inline void scr_write(struct ata_port *ap, unsigned int reg, u32 val)
         ap->ops->scr_write(ap, reg, val);
 }
 
+static inline void scr_write_flush(struct ata_port *ap, unsigned int reg, 
+                                   u32 val)
+{
+        ap->ops->scr_write(ap, reg, val);
+        (void) ap->ops->scr_read(ap, reg);
+}
+
 static inline unsigned int sata_dev_present(struct ata_port *ap)
 {
         return ((scr_read(ap, SCR_STATUS) & 0xf) == 0x3) ? 1 : 0;