diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-24 22:16:13 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-24 22:16:13 +0000 |
| commit | c8d701be3840f92e6459dabd99c9ca5d9b46a09f (patch) | |
| tree | bab6ffbf173eda290325f57fcd0aaeb0dce973ed /drivers | |
| parent | b190539857b5b952e71e316de72ba1447774d654 (diff) | |
More merging. Chainsaw style.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 28d204e30..799fd7fb6 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -459,12 +459,8 @@ static void scan_scsis (struct Scsi_Host *shpnt, /* Make sure we have something that is valid for DMA purposes */ -#ifndef CONFIG_SGI scsi_result = ( ( !shpnt->unchecked_isa_dma ) ? &scsi_result0[0] : scsi_init_malloc (512, GFP_DMA)); -#else - scsi_result = (scsi_init_malloc (512, GFP_DMA)); -#endif if (scsi_result == NULL) { |