bk://gkernel.bkbits.net/libata-2.6
jgarzik@pobox.com|ChangeSet|20041028025913|39491 jgarzik

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/10/27 22:59:13-04:00 jgarzik@pobox.com 
#   [libata] cosmetic libata.h changes to make merging with 2.4 easier
# 
# include/linux/libata.h
#   2004/10/27 22:59:07-04:00 jgarzik@pobox.com +2 -3
#   [libata] cosmetic libata.h changes to make merging with 2.4 easier
# 
diff -Nru a/include/linux/libata.h b/include/linux/libata.h
--- a/include/linux/libata.h	2004-10-28 22:28:23 -07:00
+++ b/include/linux/libata.h	2004-10-28 22:28:23 -07:00
@@ -417,13 +417,12 @@
 extern int pci_test_config_bits(struct pci_dev *pdev, struct pci_bits *bits);
 extern void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat);
 extern void ata_eng_timeout(struct ata_port *ap);
+extern void ata_scsi_simulate(u16 *id, struct scsi_cmnd *cmd,
+			      void (*done)(struct scsi_cmnd *));
 extern int ata_std_bios_param(struct scsi_device *sdev,
 			      struct block_device *bdev,
 			      sector_t capacity, int geom[]);
 extern int ata_scsi_slave_config(struct scsi_device *sdev);
-extern void ata_scsi_simulate(u16 *id,
-			      struct scsi_cmnd *cmd,
-			      void (*done)(struct scsi_cmnd *));
 
 static inline unsigned int ata_tag_valid(unsigned int tag)
 {