lkml.org 
[lkml]   [1998]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject2.0.34-pre7 fixes
Date
Fixes to pre7:

- add missing hook for boot time probe of ne2k-pci driver
- misplaced "ne.c" in lance.c driver from code-clone fixed
- warnings associated with a non-PCI compile of aic7xxx fixed
- shared IRQ support for SMC-Ultra32 EISA cards.

Paul.
--

diff -ur linux-34pre7/drivers/net/Space.c linux/drivers/net/Space.c
--- linux-34pre7/drivers/net/Space.c Sun Apr 12 00:49:19 1998
+++ linux/drivers/net/Space.c Sun Apr 12 01:00:29 1998
@@ -45,6 +45,7 @@
extern int wd_probe(struct device *dev);
extern int el2_probe(struct device *dev);
extern int ne_probe(struct device *dev);
+extern int ne2k_pci_probe(struct device *dev);
extern int hp_probe(struct device *dev);
extern int hp_plus_probe(struct device *dev);
extern int znet_probe(struct device *);
@@ -152,7 +153,10 @@
#ifdef CONFIG_E2100 /* Cabletron E21xx series. */
&& e2100_probe(dev)
#endif
-#if defined(CONFIG_NE2000) || defined(NE2000)
+#if defined(CONFIG_PCI_NE2000)
+ && ne2k_pci_probe(dev)
+#endif
+#if defined(CONFIG_NE2000)
&& ne_probe(dev)
#endif
#ifdef CONFIG_AT1500
diff -ur linux-34pre7/drivers/net/lance.c linux/drivers/net/lance.c
--- linux-34pre7/drivers/net/lance.c Sun Apr 12 00:49:21 1998
+++ linux/drivers/net/lance.c Sun Apr 12 00:57:39 1998
@@ -340,7 +340,7 @@
return -EPERM;
}
if (register_netdev(dev) != 0) {
- printk(KERN_WARNING "ne.c: No PCnet/LANCE card found (i/o = 0x%x).\n", io[this_dev]);
+ printk(KERN_WARNING "lance.c: No PCnet/LANCE card found (i/o = 0x%x).\n", io[this_dev]);
if (found != 0) return 0; /* Got at least one. */
return -ENXIO;
}
diff -ur linux-34pre7/drivers/net/smc-ultra32.c linux/drivers/net/smc-ultra32.c
--- linux-34pre7/drivers/net/smc-ultra32.c Tue Aug 12 23:04:57 1997
+++ linux/drivers/net/smc-ultra32.c Sun Apr 12 01:02:56 1998
@@ -238,8 +238,9 @@
static int ultra32_open(struct device *dev)
{
int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET; /* ASIC addr */
+ int irq_flags = (inb(ioaddr + ULTRA32_CFG5) & 0x08) ? 0 : SA_SHIRQ;

- if (request_irq(dev->irq, ei_interrupt, 0, ei_status.name, NULL))
+ if (request_irq(dev->irq, ei_interrupt, irq_flags, ei_status.name, dev))
return -EAGAIN;

outb(ULTRA32_MEMENB, ioaddr); /* Enable Shared Memory. */
diff -ur linux-34pre7/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
--- linux-34pre7/drivers/scsi/aic7xxx.c Sun Apr 12 00:49:32 1998
+++ linux/drivers/scsi/aic7xxx.c Sun Apr 12 01:11:48 1998
@@ -6122,10 +6122,12 @@
{
int found = 0;
aha_status_type adapter_bios;
+#ifdef CONFIG_PCI
aha_chip_class_type chip_class;
+ int chan_num = 0;
+#endif
aha_chip_type chip_type;
int slot, base;
- int chan_num = 0;
unsigned char hcntrl, sxfrctl1, sblkctl, hostconf, irq = 0;
int i;
struct aic7xxx_host *p;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu

\
 
 \ /
  Last update: 2005-03-22 13:42    [W:0.040 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site