diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
| commit | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch) | |
| tree | 5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /drivers/net | |
| parent | 52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff) | |
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little
children for lunch, so if you try this on your machine make backups
first ...
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Makefile | 16 | ||||
| -rw-r--r-- | drivers/net/ibmtr.c | 5 | ||||
| -rw-r--r-- | drivers/net/irda/irport.c | 2 |
3 files changed, 5 insertions, 18 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index f0f990aad..5e2a45bce 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -143,14 +143,6 @@ else endif endif -ifeq ($(CONFIG_ETHERH),y) -CONFIG_8390_BUILTIN = y -else - ifeq ($(CONFIG_ETHERH),m) - CONFIG_8390_MODULE = y - endif -endif - ifeq ($(CONFIG_WD80x3),y) L_OBJS += wd.o CONFIG_8390_BUILTIN = y @@ -171,14 +163,6 @@ else endif endif -ifeq ($(CONFIG_ETHERH),y) -CONFIG_8390_BUILTIN = y -else - ifeq ($(CONFIG_ETHERH),m) - CONFIG_8390_MODULE = y - endif -endif - ifeq ($(CONFIG_NE2K_PCI),y) L_OBJS += ne2k-pci.o CONFIG_8390_BUILTIN = y diff --git a/drivers/net/ibmtr.c b/drivers/net/ibmtr.c index f8d53cea4..29356bbbf 100644 --- a/drivers/net/ibmtr.c +++ b/drivers/net/ibmtr.c @@ -515,7 +515,7 @@ __initfunc(static int ibmtr_probe1(struct device *dev, int PIOaddr)) /* How much shared RAM is on adapter ? */ #ifdef PCMCIA ti->avail_shared_ram = pcmcia_reality_check(get_sram_size(ti)); - ibmtr_mem_base = ti->sram_base ; + ibmtr_mem_base = ti->sram_base << 12 ; #else ti->avail_shared_ram = get_sram_size(ti); #endif @@ -835,6 +835,9 @@ static int tok_close(struct device *dev) (int)readb(ti->srb + offsetof(struct srb_close_adapter, ret_code))); dev->start = 0; +#ifdef PCMCIA + ti->sram = 0 ; +#endif DPRINTK("Adapter closed.\n"); MOD_DEC_USE_COUNT; diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index 5fb0cd4f2..e813fe8a4 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c @@ -321,7 +321,7 @@ void irport_change_speed(struct irda_device *idev, int speed) /* Turn on interrups */ outb(UART_IER_RLSI|UART_IER_RDI|UART_IER_THRI, iobase+UART_IER); - spin_unlock_irqrestore(&self->lock, flags); + spin_unlock_irqrestore(&idev->lock, flags); } /* |