Merge branch 'tmp'

[linux-2.6] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index cf59ecfff8656864ba5548ebe3460df37bb058e5..d34963c186563f876868c89d4dde6958538b9dd3 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -240,7 +240,7 @@ struct ata_port;
 struct ata_queued_cmd;
 
 /* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
+typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
 
 struct ata_ioports {
        unsigned long           cmd_addr;