2.1.33, patch to fix minor typos

sphilp@alliance.net
Fri, 11 Apr 1997 20:06:38 -0400


The first two correct a double-dot problem.
Also, if parport is a module, CONFIG_PNP_PARPORT_AUTOPROBE must be y, or a
symbol will be missing.

The third looks like some patch was out of sync for IBM MCA and modules

diff -Bbur l2133/drivers/pnp/parport_share.c linux-2.1.33/drivers/pnp/parport_share.c
--- l2133/drivers/pnp/parport_share.c Thu Apr 10 00:30:31 1997
+++ linux-2.1.33/drivers/pnp/parport_share.c Fri Apr 11 18:33:51 1997
@@ -64,7 +64,7 @@
if (new.dma >= 0) {
if (request_dma(new.dma, new.name)) {
printk(KERN_INFO "%s: unable to claim DMA %d\n",
- new.name, new..dma);
+ new.name, new.dma);
release_region(new.base, new.size);
if( new.modes & PARPORT_MODE_ECR )
release_region(new.base+0x400, 3);
diff -Bbur l2133/drivers/scsi/ppa.c linux-2.1.33/drivers/scsi/ppa.c
--- l2133/drivers/scsi/ppa.c Thu Apr 10 00:30:31 1997
+++ linux-2.1.33/drivers/scsi/ppa.c Fri Apr 11 18:39:00 1997
@@ -1193,7 +1193,7 @@
hreg->n_io_port = ports;
hreg->dma_channel = -1;
hreg->unique_id = i;
- ppa_hosts[i]..host = hreg->host_no;
+ ppa_hosts[i].host = hreg->host_no;
nhosts++;
}
if (nhosts == 0)
diff -Bbur l2133/drivers/scsi/Config.in linux-2.1.33/drivers/scsi/Config.in
--- l2133/drivers/scsi/Config.in Thu Apr 10 00:30:31 1997
+++ linux-2.1.33/drivers/scsi/Config.in Fri Apr 11 19:06:35 1997
@@ -71,7 +71,7 @@
fi
fi
if [ "$CONFIG_MCA" = "y" ]; then
- bool 'IBMMCA SCSI support' CONFIG_SCSI_IBMMCA
+ dep_tristate 'IBMMCA SCSI support' CONFIG_SCSI_IBMMCA $CONFIG_SCSI
fi
if [ "$CONFIG_PNP_PARPORT" != "n" ]; then
dep_tristate 'IOMEGA Parallel Port ZIP drive SCSI support' CONFIG_SCSI_PPA $CONFIG_SCSI $CONFIG_PNP_PARPORT
@@ -79,7 +79,6 @@
int ' Pedantic EPP-checking' CONFIG_SCSI_PPA_HAVE_PEDANTIC 2 0 3
int ' EPP timeout' CONFIG_SCSI_PPA_EPP_TIME 128
fi
- dep_tristate 'IBMMCA SCSI support' CONFIG_SCSI_IBMMCA $CONFIG_SCSI
fi
dep_tristate 'PAS16 SCSI support' CONFIG_SCSI_PAS16 $CONFIG_SCSI
dep_tristate 'Qlogic FAS SCSI support' CONFIG_SCSI_QLOGIC_FAS $CONFIG_SCSI