Messages in this thread Patch in this message |  | | | Date | Fri, 11 Apr 1997 16:59:32 +0000 (GMT) | | From | Philip Blundell <> | | Subject | Re: parport in 2.1.33 |
| |
On 11 Apr 1997, Michael Harnois wrote:
> Parport doesn't link if autoprobe is disabled: > > drivers/pnp/pnp.a(parport_init.o): In function `pnp_parport_init': > parport_init.o(.text+0xd8e): undefined reference to `parport_probe_one'
Yeah, sorry about that. Here are some patches against 2.1.33 to fix this and a few other problems.
- we don't pretend scsi_syms.o is a proper module any more - Configure admits negative integers by default (needed for sound config) - AMD PCscsi compiles again when not a module - turn off a debugging message in the Etherlink Plus driver - disentangle MCA SCSI support from PPA - typos in ppa.c and parport_share.c - nfsd compiles with glibc now
phil
diff -u -r 1.2 3c505.c --- linux/drivers/net/3c505.c 1997/04/11 15:12:52 1.2 +++ linux/drivers/net/3c505.c 1997/04/11 15:41:25 @@ -450,7 +450,9 @@ return TRUE; break; case ASF_PCB_NAK: - printk("%s: send_pcb got NAK\n", dev->name); +#ifdef ELP_DEBUG + printk(KERN_DEBUG "%s: send_pcb got NAK\n", dev->name); +#endif goto abort; break; } diff -u -r1.2 parport_init.c --- linux/drivers/pnp/parport_init.c 1997/04/11 15:12:58 1.2 +++ linux/drivers/pnp/parport_init.c 1997/04/11 15:25:14 @@ -761,8 +761,10 @@ #undef PORT } +#ifdef CONFIG_PNP_PARPORT_AUTOPROBE for (pb = parport_enumerate(); pb; pb = pb->next) parport_probe_one(pb); +#endif return 0; } diff -u -r1.2 parport_share.c --- linux/drivers/pnp/parport_share.c 1997/04/11 15:12:59 1.2 +++ linux/drivers/pnp/parport_share.c 1997/04/11 15:24:58 @@ -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 -u -r1.3 Config.in --- linux/drivers/scsi/Config.in 1997/04/11 15:13:01 1.3 +++ linux/drivers/scsi/Config.in 1997/04/11 15:27:07 @@ -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 diff -u -r1.1.1.1 Makefile --- linux/drivers/scsi/Makefile 1997/03/21 17:40:03 1.1.1.1 +++ linux/drivers/scsi/Makefile 1997/04/11 15:56:50 @@ -10,6 +10,7 @@ L_OBJS := M_OBJS := MX_OBJS := +MIX_OBJS := MOD_LIST_NAME := SCSI_MODULES SCSI_SRCS = $(wildcard $(L_OBJS:%.o=%.c)) @@ -45,7 +46,7 @@ endif else ifeq ($(CONFIG_SCSI),m) - MX_OBJS += scsi_syms.o + MIX_OBJS += scsi_syms.o M_OBJS += scsi_mod.o endif endif @@ -412,9 +413,9 @@ ncr53c8xx.o : ncr53c8xx.c $(CC) $(CFLAGS) -c ncr53c8xx.c -scsi_mod.o: $(MX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \ +scsi_mod.o: $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \ scsicam.o scsi_proc.o - $(LD) $(LD_RFLAG) -r -o $@ $(MX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o scsicam.o scsi_proc.o + $(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o scsicam.o scsi_proc.o sr_mod.o: sr.o sr_ioctl.o $(SR_VENDOR) $(LD) $(LD_RFLAG) -r -o $@ sr.o sr_ioctl.o $(SR_VENDOR) diff -u -r1.2 ppa.c --- linux/drivers/scsi/ppa.c 1997/04/11 15:13:05 1.2 +++ linux/drivers/scsi/ppa.c 1997/04/11 15:26:05 @@ -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 -u -r1.2 Configure --- linux/scripts/Configure 1997/04/11 15:13:30 1.2 +++ linux/scripts/Configure 1997/04/11 15:30:00 @@ -47,8 +47,9 @@ # 090397 Axel Boldt (boldt@math.ucsb.edu) - avoid ? and + in regular # expressions for GNU expr since version 1.15 and up use \? and \+. # -# 300397 Phil Blundell (pjb27@cam.ac.uk) - added support for "limint", -# allow dep_tristate to take a list of dependencies rather than just one. +# 300397 Phil Blundell (pjb27@cam.ac.uk) - added support for min/max +# arguments to "int", allow dep_tristate to take a list of dependencies +# rather than just one. # # Make sure we're really running bash. @@ -311,7 +312,7 @@ if [ $# -gt 3 ]; then min=$4 else - min=1 + min=-10000000 # !! fi if [ $# -gt 4 ]; then max=$5 diff -u -r1.2 AM53C974.h --- linux/drivers/scsi/AM53C974.h 1997/04/05 23:36:04 1.2 +++ linux/drivers/scsi/AM53C974.h 1997/04/11 16:18:50 @@ -30,6 +30,8 @@ #ifndef AM53C974_H #define AM53C974_H +#include <scsi/scsicam.h> + struct AM53C974_hostdata { volatile unsigned in_reset:1; /* flag, says bus reset pending */ volatile unsigned aborted:1; /* flag, says aborted */ diff -u -r1.1 vfs.c --- linux/fs/nfsd/vfs.c 1997/04/05 23:36:22 1.1 +++ linux/fs/nfsd/vfs.c 1997/04/11 15:58:06 @@ -29,7 +29,7 @@ #include <linux/in.h> #include <linux/unistd.h> #include <linux/malloc.h> -#include <netinet/in.h> +#include <linux/in.h> #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h>
|  |