diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-06-27 23:10:39 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-06-27 23:10:39 +0000 |
| commit | b3a6b261beadb246d2867813fdd7193d6dae045f (patch) | |
| tree | 404d0f37ca664e8ffc6087ef0423be4f69da53aa /sys/dev/ic/ami.c | |
| parent | 723d01e179018b9476d500e69f36dfe157dff343 (diff) | |
unbreak builds without BIO by moving the sensor setup back under its ifdef.
i could move the shared code that the sensor and bio paths use, but this
would add bloat i think.
found by _mx, fix by deraadt@
Diffstat (limited to 'sys/dev/ic/ami.c')
| -rw-r--r-- | sys/dev/ic/ami.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index b6810efa676..968238b48bf 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.168 2006/06/27 08:01:05 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.169 2006/06/27 23:10:38 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -69,10 +69,10 @@ #include <dev/ic/amireg.h> #include <dev/ic/amivar.h> -#include <sys/sensors.h> #if NBIO > 0 #include <dev/biovar.h> +#include <sys/sensors.h> #endif #ifdef AMI_DEBUG @@ -548,10 +548,10 @@ ami_attach(struct ami_softc *sc) printf("%s: controller registration failed\n", DEVNAME(sc)); else sc->sc_ioctl = ami_ioctl; -#endif if (sensor_task_register(sc, ami_refresh, 10)) printf("%s: unable to register update task\n", DEVNAME(sc)); +#endif rsc = malloc(sizeof(struct ami_rawsoftc) * sc->sc_channels, M_DEVBUF, M_NOWAIT); |