diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
| commit | 84d891d6727c17832c79ec96d3d107a87d857978 (patch) | |
| tree | a189a4d00c1387e409e2f9808c72c8088728c33b /drivers/scsi/sym53c8xx_2/sym_glue.h | |
| parent | 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 (diff) | |
| parent | 7676f83aeb774e7a3abe6af06ec92b29488b5b79 (diff) | |
Merge ../scsi-rc-fixes-2.6
Conflicts:
include/scsi/scsi_devinfo.h
Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_glue.h')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index cc92d0c70cd7..a446cda3f64c 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -68,7 +68,7 @@ */ #define SYM_CONF_TIMER_INTERVAL ((HZ+1)/2) -#define SYM_OPT_HANDLE_DEVICE_QUEUEING +#undef SYM_OPT_HANDLE_DEVICE_QUEUEING #define SYM_OPT_LIMIT_COMMAND_REORDERING /* |