D60675.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60675.diff
View Options

	diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
	--- a/sys/isa/isa_common.h
	+++ b/sys/isa/isa_common.h
	@@ -48,7 +48,6 @@
	/*
	* These functions are architecture dependent.
	*/
	-extern void isa_init(device_t dev);
	extern struct resource *isa_alloc_resource(device_t bus, device_t child,
	int type, int rid, rman_res_t start, rman_res_t end, rman_res_t count,
	u_int flags);
	diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
	--- a/sys/isa/isa_common.c
	+++ b/sys/isa/isa_common.c
	@@ -94,7 +94,6 @@
	isa_probe(device_t dev)
	{
	device_set_desc(dev, "ISA bus");
	- isa_init(dev); /* Allow machdep code to initialise */
	return (0);
	}

	diff --git a/sys/powerpc/mpc85xx/isa.c b/sys/powerpc/mpc85xx/isa.c
	--- a/sys/powerpc/mpc85xx/isa.c
	+++ b/sys/powerpc/mpc85xx/isa.c
	@@ -38,11 +38,6 @@
	#include <isa/isavar.h>
	#include <isa/isa_common.h>

	-void
	-isa_init(device_t dev)
	-{
	-}
	-
	struct resource *
	isa_alloc_resource(device_t bus, device_t child, int type, int rid,
	u_long start, u_long end, u_long count, u_int flags)
	diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c
	--- a/sys/x86/isa/isa.c
	+++ b/sys/x86/isa/isa.c
	@@ -70,11 +70,6 @@
	#include <isa/isavar.h>
	#include <isa/isa_common.h>

	-void
	-isa_init(device_t dev)
	-{
	-}
	-
	/*
	* This implementation simply passes the request up to the parent
	* bus, which in our case is the special i386 nexus, substituting any