2.6.x libata release prep (bump version, etc.)
PATCH 1/1 2.6.x libata release prep (bump version, etc.)
Please pull from the 'upstream-fixes' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
to receive the changes described in the attached diffstat/changelog/patch.
drivers/scsi/ahci.c | 1 + drivers/scsi/ata_piix.c | 2 +- drivers/scsi/libata-core.c | 25 ------------------------- drivers/scsi/libata.h | 2 +- drivers/scsi/sata_promise.c | 2 +- 5 files changed, 4 insertions(+), 28 deletions(-)
commit 6885433c25aaca2cb13ee52a94be156163d6aa23
Author: Jeff Garzik <[email protected]> Date: Tue Aug 23 02:53:51 2005 -0400
libata: release prep (bump versions, etc.)
- bump versions where necessary
- remove two duplicated+outdated doc comments
- add MODULE_VERSION() to AHCI driver
drivers/scsi/ahci.c +1 -0
@@ -1105,6 +1105,7 @@ MODULE_AUTHOR("Jeff Garzik");MODULE_DESCRIPTION ("AHCI SATA low-level driver" );MODULE_LICENSE ("GPL" );MODULE_DEVICE_TABLE (pci, ahci_pci_tbl); +MODULE_VERSION (DRV_VERSION );module_init (ahci_init);module_exit (ahci_exit);
drivers/scsi/ata_piix.c +1 -1
@@ -32,7 +32,7 @@#include <linux/libata.h> #define DRV_NAME "ata_piix" -#define DRV_VERSION "1.03" +#define DRV_VERSION "1.04"enum {PIIX_IOCFG =0x54 ,/* IDE I/O configuration register */
drivers/scsi/libata-core.c +0 -25
@@ -2268,19 +2268,6 @@ void ata_qc_prep(struct ata_queued_cmd ** spin_lock_irqsave(host_set lock) */ - - -/** -* ata_sg_init_one - Prepare a one-entry scatter-gather list. -* @qc: Queued command -* @buf: transfer buffer -* @buflen: length of buf -* -* Builds a single-entry scatter-gather list to initiate a -* transfer utilizing the specified buffer. -* -* LOCKING: -*/ void ata_sg_init_one (struct ata_queued_cmd *qc,void *buf,unsigned int buflen) {struct scatterlist *sg;
@@ -2312,18 +2299,6 @@ void ata_sg_init_one(struct ata_queued_c* spin_lock_irqsave(host_set lock) */ - -/** -* ata_sg_init - Assign a scatter gather list to a queued command -* @qc: Queued command -* @sg: Scatter-gather list -* @n_elem: length of sg list -* -* Attaches a scatter-gather list to a queued command. -* -* LOCKING: -*/ -void ata_sg_init (struct ata_queued_cmd *qc,struct scatterlist *sg,unsigned int n_elem) {
drivers/scsi/libata.h +1 -1
@@ -26,7 +26,7 @@#define __LIBATA_H__#define DRV_NAME "libata" -#define DRV_VERSION "1.11"/* must be exactly four chars */ +#define DRV_VERSION "1.12"/* must be exactly four chars */ struct ata_scsi_args {u16 *id;
drivers/scsi/sata_promise.c +1 -1
@@ -40,7 +40,7 @@#include "sata_promise.h" #define DRV_NAME "sata_promise" -#define DRV_VERSION "1.01" +#define DRV_VERSION "1.02"enum {