Remove various bits of conditional Alpha code and fixup a few comments.

2 files changed, 0 insertions, 6 deletions

diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index 23c7454..f824c4d 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -73,9 +73,6 @@ __FBSDID("$FreeBSD$");
 
 #include <isa/isavar.h>
 #include <isa/isa_common.h>
-#ifdef __alpha__		/* XXX workaround a stupid warning */
-#include <alpha/isa/isavar.h>
-#endif
 
 static int	isa_print_child(device_t bus, device_t dev);
 
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 65e0ad5..3f29807 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -69,13 +69,10 @@ extern struct resource *isa_alloc_resource(device_t bus, device_t child,
 extern int isa_release_resource(device_t bus, device_t child,
     int type, int rid, struct resource *r);
 
-/* XXX alphe declares these elsewhere */
-#ifndef __alpha__
 extern int isa_setup_intr(device_t bus, device_t child, struct resource *r,
     int flags, void (*ihand)(void *), void *arg, void **cookiep);
 extern int isa_teardown_intr(device_t bus, device_t child, struct resource *r,
     void *cookie);
-#endif
 
 extern driver_t isa_driver;
 extern devclass_t isa_devclass;