aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew N. Dodd <mdodd@FreeBSD.org>2003-03-30 08:13:47 +0000
committerMatthew N. Dodd <mdodd@FreeBSD.org>2003-03-30 08:13:47 +0000
commitd938c3689d4dc97bfa2fc0c98fd893bc4a1979e4 (patch)
tree3105547afc911c64b15003c481f11731ee12fac0
parentce6a61aaa070fa0a05f9f1fcbc1f1913de07ef94 (diff)
downloadsrc-d938c3689d4dc97bfa2fc0c98fd893bc4a1979e4.tar.gz
src-d938c3689d4dc97bfa2fc0c98fd893bc4a1979e4.zip
Revert 1.21; this was local code that should not have been
committed.
Notes
Notes: svn path=/head/; revision=112845
-rw-r--r--sys/dev/ep/if_ep_eisa.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index afae38955ac1..e9b8348edd91 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -38,8 +38,8 @@
#include <net/if_arp.h>
#include <net/if_media.h>
-#include <dev/eisa/eisa_busreg.h>
-#include <dev/eisa/eisa_busvar.h>
+
+#include <dev/eisa/eisaconf.h>
#include <dev/ep/if_epreg.h>
#include <dev/ep/if_epvar.h>
@@ -122,8 +122,8 @@ ep_eisa_probe(device_t dev)
if ((inw(iobase + EP_W0_ADDRESS_CFG) & 0x1f) != 0x1f)
return ENXIO;
- eisa_add_iospace(dev, iobase, EP_EISA_IOSIZE);
- eisa_add_iospace(dev, port, EP_IOSIZE);
+ eisa_add_iospace(dev, iobase, EP_EISA_IOSIZE, RESVADDR_NONE);
+ eisa_add_iospace(dev, port, EP_IOSIZE, RESVADDR_NONE);
conf = inw(iobase + EISA_IOCONF);
/* Determine our IRQ */
@@ -171,7 +171,7 @@ ep_eisa_probe(device_t dev)
break;
}
- eisa_add_irq(dev, irq, int_trig);
+ eisa_add_intr(dev, irq, int_trig);
return 0;
}