Skip to content

L
linux
Commit 065f9b84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://gkernel.bkbits.net/libata-2.6 

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents ea1c2f10 8eec2593
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/scsi/libata.h
View file @ 065f9b84
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define __LIBATA_H__ #define __LIBATA_H__
#define DRV_NAME "libata" #define DRV_NAME "libata"
#define DRV_VERSION "1.01" /* must be exactly four chars */ #define DRV_VERSION "1.02" /* must be exactly four chars */
struct ata_scsi_args { struct ata_scsi_args {
struct ata_port *ap; struct ata_port *ap;
......
drivers/scsi/sata_sil.c
View file @ 065f9b84
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_sil" #define DRV_NAME "sata_sil"
#define DRV_VERSION "0.53" #define DRV_VERSION "0.54"
enum { enum {
sil_3112 = 0, sil_3112 = 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7