From c8d701be3840f92e6459dabd99c9ca5d9b46a09f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 24 Jun 1999 22:16:13 +0000 Subject: More merging. Chainsaw style. --- drivers/scsi/scsi.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/scsi') 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) { -- cgit v1.2.3