Merge branch 'tmp'

2006-01-27 02:29:20 -05:00
parent 8dd2e3bd57 77853bf2b4
commit 628e386e27
3 changed files with 32 additions and 59 deletions
--- 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;