diff options
author | Dan Williams <dan.j.williams@intel.com> | 2012-01-04 04:33:10 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-01-16 02:44:54 -0500 |
commit | d3fd2e2bc29b1f0979352994f9035359003461c3 (patch) | |
tree | a991571aace4f23eb1c69fda48bea49edaadfa90 | |
parent | 27234ab44f97d85bab062a9d18aaff99addd267d (diff) |
[SCSI] isci: update version to 1.1
Bump the version now that the driver has atapi support and the initial
round of hotplug fixes. The EXPERIMENTAL tag should have been removed a
while back. While we're here also kill the "select SCSI_SAS_HOST_SMP"
as the build error was separately fixed by commit d962480e "[SCSI]
libsas: fix try_test_sas_gpio_gp_bit() build error".
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/Kconfig | 5 | ||||
-rw-r--r-- | drivers/scsi/isci/init.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 06ea3bcfdd2a..16570aa84aac 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -830,16 +830,11 @@ config SCSI_ISCI | |||
830 | tristate "Intel(R) C600 Series Chipset SAS Controller" | 830 | tristate "Intel(R) C600 Series Chipset SAS Controller" |
831 | depends on PCI && SCSI | 831 | depends on PCI && SCSI |
832 | depends on X86 | 832 | depends on X86 |
833 | # (temporary): known alpha quality driver | ||
834 | depends on EXPERIMENTAL | ||
835 | select SCSI_SAS_LIBSAS | 833 | select SCSI_SAS_LIBSAS |
836 | select SCSI_SAS_HOST_SMP | ||
837 | ---help--- | 834 | ---help--- |
838 | This driver supports the 6Gb/s SAS capabilities of the storage | 835 | This driver supports the 6Gb/s SAS capabilities of the storage |
839 | control unit found in the Intel(R) C600 series chipset. | 836 | control unit found in the Intel(R) C600 series chipset. |
840 | 837 | ||
841 | The experimental tag will be removed after the driver exits alpha | ||
842 | |||
843 | config SCSI_GENERIC_NCR5380 | 838 | config SCSI_GENERIC_NCR5380 |
844 | tristate "Generic NCR5380/53c400 SCSI PIO support" | 839 | tristate "Generic NCR5380/53c400 SCSI PIO support" |
845 | depends on ISA && SCSI | 840 | depends on ISA && SCSI |
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 2bcfb40ae9ad..17c4c2c89c2e 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
@@ -65,7 +65,7 @@ | |||
65 | #include "probe_roms.h" | 65 | #include "probe_roms.h" |
66 | 66 | ||
67 | #define MAJ 1 | 67 | #define MAJ 1 |
68 | #define MIN 0 | 68 | #define MIN 1 |
69 | #define BUILD 0 | 69 | #define BUILD 0 |
70 | #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \ | 70 | #define DRV_VERSION __stringify(MAJ) "." __stringify(MIN) "." \ |
71 | __stringify(BUILD) | 71 | __stringify(BUILD) |