diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/scsi/sata_uli.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/scsi/sata_uli.c')
| -rw-r--r-- | drivers/scsi/sata_uli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index f668c997e9af..64f3c1aeed21 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include <linux/libata.h> | 37 | #include <linux/libata.h> |
| 38 | 38 | ||
| 39 | #define DRV_NAME "sata_uli" | 39 | #define DRV_NAME "sata_uli" |
| 40 | #define DRV_VERSION "0.6" | 40 | #define DRV_VERSION "1.0" |
| 41 | 41 | ||
| 42 | enum { | 42 | enum { |
| 43 | uli_5289 = 0, | 43 | uli_5289 = 0, |