Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / scsi / stex.c

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 7edbcc9bc9d693853b3fad6310a0300df0de890f..69be1324b114ffc274cadd4e805b8e89c4ea1bd3 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -11,15 +11,12 @@
  *     Written By:
  *             Ed Lin <promise_linux@promise.com>
  *
- *     Version: 3.0.0.1
- *
  */
 
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/pci.h>
 #include <linux/blkdev.h>
@@ -37,9 +34,9 @@
 #include <scsi/scsi_tcq.h>
 
 #define DRV_NAME "stex"
-#define ST_DRIVER_VERSION "3.0.0.1"
+#define ST_DRIVER_VERSION "3.1.0.1"
 #define ST_VER_MAJOR           3
-#define ST_VER_MINOR           0
+#define ST_VER_MINOR           1
 #define ST_OEM                         0
 #define ST_BUILD_VER           1