nfsd: move some of fh_compose into helper functions

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

diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 4e2b2af..8d2a95c 100644 (file)
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -36,11 +36,11 @@
 #include <scsi/scsi_eh.h>
 
 #define DRV_NAME "stex"
-#define ST_DRIVER_VERSION "4.6.0000.1"
-#define ST_VER_MAJOR           4
-#define ST_VER_MINOR           6
-#define ST_OEM                         0
-#define ST_BUILD_VER           1
+#define ST_DRIVER_VERSION "4.6.0000.3"
+#define ST_VER_MAJOR           4
+#define ST_VER_MINOR           6
+#define ST_OEM                 0
+#define ST_BUILD_VER           3
 
 enum {
        /* MU register offset */
@@ -1395,12 +1395,12 @@ static int stex_set_dma_mask(struct pci_dev * pdev)
 {
        int ret;
 
-       if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
-               && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
+       if (!pci_set_dma_mask(pdev,  DMA_BIT_MASK(64))
+               && !pci_set_consistent_dma_mask(pdev,  DMA_BIT_MASK(64)))
                return 0;
-       ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+       ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
        if (!ret)
-               ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+               ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
        return ret;
 }