diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2004-08-12 17:41:33 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2004-08-12 17:41:33 +0000 |
| commit | 26280d88d76716790cf28f23fdb0bda56533e9b6 (patch) | |
| tree | e750b2d26d6511903970a6a2a5d73da06845d58b /sys/dev/isp | |
| parent | 9f7f340a0f9eb8af47d81687feb963fa612242e9 (diff) | |
Notes
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_sbus.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c index a1f912de87f1..5f87f3dbb08e 100644 --- a/sys/dev/isp/isp_sbus.c +++ b/sys/dev/isp/isp_sbus.c @@ -35,11 +35,12 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/module.h> #include <sys/resource.h> + +#include <dev/ofw/ofw_bus.h> + #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> -#include <dev/ofw/openfirm.h> -#include <machine/ofw_machdep.h> #include <sparc64/sbus/sbusvar.h> #include <dev/isp/isp_freebsd.h> @@ -110,7 +111,7 @@ static int isp_sbus_probe(device_t dev) { int found = 0; - char *name = sbus_get_name(dev); + const char *name = ofw_bus_get_name(dev); if (strcmp(name, "SUNW,isp") == 0 || strcmp(name, "QLGC,isp") == 0 || strcmp(name, "ptisp") == 0 || @@ -240,8 +241,8 @@ isp_sbus_attach(device_t dev) * would fail in trying to download (via poking) * FW. We give up on them. */ - if (strcmp("PTI,ptisp", sbus_get_name(dev)) == 0 || - strcmp("ptisp", sbus_get_name(dev)) == 0) { + if (strcmp("PTI,ptisp", ofw_bus_get_name(dev)) == 0 || + strcmp("ptisp", ofw_bus_get_name(dev)) == 0) { isp->isp_confopts |= ISP_CFG_NORELOAD; } |