patch-2.1.85 linux/drivers/net/de4x5.c
Next file: linux/drivers/net/hamradio/Config.in
Previous file: linux/drivers/net/8390.c
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
Mon Feb 2 13:42:07 1998
- Orig file:
v2.1.84/linux/drivers/net/de4x5.c
- Orig date:
Fri Jan 30 11:28:07 1998
diff -u --recursive --new-file v2.1.84/linux/drivers/net/de4x5.c linux/drivers/net/de4x5.c
@@ -2216,7 +2216,7 @@
__initfunc(static void
srom_search(int index))
{
- u_char pb, dev_fn;
+ u_char pb, dev_fn, tirq;
u_short dev_id, dev_num, vendor, status;
u_int tmp, irq = 0, device, class = DE4X5_CLASS_CODE;
u_long iobase = 0; /* Clear upper 32 bits in Alphas */
@@ -2266,8 +2266,8 @@
/* Fetch the IRQ to be used */
#ifndef __sparc_v9__
- pcibios_read_config_byte(pb, PCI_DEVICE, PCI_INTERRUPT_LINE,
- (char *)&irq);
+ pcibios_read_config_byte(pb, PCI_DEVICE, PCI_INTERRUPT_LINE, &tirq);
+ irq = tirq;
#else
irq = pdev->irq;
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov