Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / ata / libata.h

diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index f8bd955c5ba72e3c78467cc6b8e5d030728b000c..90df58a3edc95ff4cdab4bc43fc2046c20b430c6 100644 (file)
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -69,11 +69,12 @@ extern void ata_dev_disable(struct ata_device *dev);
 extern void ata_port_flush_task(struct ata_port *ap);
 extern unsigned ata_exec_internal(struct ata_device *dev,
                                  struct ata_taskfile *tf, const u8 *cdb,
-                                 int dma_dir, void *buf, unsigned int buflen);
+                                 int dma_dir, void *buf, unsigned int buflen,
+                                 unsigned long timeout);
 extern unsigned ata_exec_internal_sg(struct ata_device *dev,
                                     struct ata_taskfile *tf, const u8 *cdb,
                                     int dma_dir, struct scatterlist *sg,
-                                    unsigned int n_elem);
+                                    unsigned int n_elem, unsigned long timeout);
 extern unsigned int ata_do_simple_cmd(struct ata_device *dev, u8 cmd);
 extern int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                           unsigned int flags, u16 *id);