diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
| commit | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (patch) | |
| tree | 456799ad9fce41cdb2186ba3872c7a077ec3bd05 /drivers/scsi/sata_mv.c | |
| parent | d67e7ebb2a15bf0429c55f2fc1c4b02808367874 (diff) | |
| parent | 1b15688b31d8c88881102426279e8cc03953860b (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 6dc2a612ccbd..edd0afa852eb 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * sata_mv.c - Marvell SATA support | 2 | * sata_mv.c - Marvell SATA support |
| 3 | * | 3 | * |
| 4 | * Copyright 2005: EMC Corporation, all rights reserved. | 4 | * Copyright 2005: EMC Corporation, all rights reserved. |
| 5 | * Copyright 2005 Red Hat, Inc. All rights reserved. | ||
| 5 | * | 6 | * |
| 6 | * Please ALWAYS copy linux-ide@vger.kernel.org on emails. | 7 | * Please ALWAYS copy linux-ide@vger.kernel.org on emails. |
| 7 | * | 8 | * |
| @@ -36,7 +37,7 @@ | |||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | 38 | ||
| 38 | #define DRV_NAME "sata_mv" | 39 | #define DRV_NAME "sata_mv" |
| 39 | #define DRV_VERSION "0.25" | 40 | #define DRV_VERSION "0.5" |
| 40 | 41 | ||
| 41 | enum { | 42 | enum { |
| 42 | /* BAR's are enumerated in terms of pci_resource_start() terms */ | 43 | /* BAR's are enumerated in terms of pci_resource_start() terms */ |