diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/pnp | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/Makefile | 6 | ||||
| -rw-r--r-- | drivers/pnp/isapnp.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index 9c024342a..d9b6fe96b 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -25,7 +25,7 @@ ifeq ($(CONFIG_ISAPNP),m) endif ifeq ($(CONFIG_ISAPNP),y) - O_TARGET := isa-pnp.o + O_TARGET := pnp.o OX_OBJS := isapnp.o O_OBJS := quirks.o $(PROC_OBJS) endif @@ -33,5 +33,5 @@ endif include $(TOPDIR)/Rules.make -isa-pnp.o: isapnp.o quirks.o $(PROC_OBJS) - $(LD) $(LD_RFLAG) -r -o $@ isapnp.o quirks.o $(PROC_OBJS) +isa-pnp.o: $(MIX_OBJS) $(MI_OBJS) + $(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) $(MI_OBJS) diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c index ec81da498..073248758 100644 --- a/drivers/pnp/isapnp.c +++ b/drivers/pnp/isapnp.c @@ -436,6 +436,7 @@ static struct pci_dev * __init isapnp_parse_device(struct pci_bus *card, int siz dev = isapnp_alloc(sizeof(struct pci_dev)); if (!dev) return NULL; + dev->dma_mask = 0x00ffffff; dev->devfn = number; dev->vendor = (tmp[1] << 8) | tmp[0]; dev->device = (tmp[3] << 8) | tmp[2]; |