Merge branch 'from-linus' into upstream

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

diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index f668c997e9af0bccf3637fe60375c6ebbd7ee661..33cdb4867ef13bd222b92695bf2317eb741d8f67 100644 (file)
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -37,7 +36,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_uli"
-#define DRV_VERSION    "0.6"
+#define DRV_VERSION    "1.0"
 
 enum {
        uli_5289                = 0,