diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:04:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:04:52 -0400 |
| commit | 280ff388b1b7a818a64af4c789299e62c0d3c094 (patch) | |
| tree | d63877375029eb895131a37d2eeeac306cc6c7f0 /drivers/scsi/3w-xxxx.h | |
| parent | c5da9a2bb24a7928c39495cdabf98d3f7931bde5 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into x86/urgent
Merge reason: fix to be queued up depends on upstream facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/scsi/3w-xxxx.h')
| -rw-r--r-- | drivers/scsi/3w-xxxx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h index 0742e6846656..8e71e5e122b3 100644 --- a/drivers/scsi/3w-xxxx.h +++ b/drivers/scsi/3w-xxxx.h | |||
| @@ -234,7 +234,7 @@ static unsigned char tw_sense_table[][4] = | |||
| 234 | #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */ | 234 | #define TW_IOCTL_TIMEOUT 25 /* 25 seconds */ |
| 235 | #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */ | 235 | #define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */ |
| 236 | #define TW_IOCTL_CHRDEV_FREE -1 | 236 | #define TW_IOCTL_CHRDEV_FREE -1 |
| 237 | #define TW_DMA_MASK DMA_32BIT_MASK | 237 | #define TW_DMA_MASK DMA_BIT_MASK(32) |
| 238 | #define TW_MAX_CDB_LEN 16 | 238 | #define TW_MAX_CDB_LEN 16 |
| 239 | 239 | ||
| 240 | /* Bitmask macros to eliminate bitfields */ | 240 | /* Bitmask macros to eliminate bitfields */ |