diff options
| author |   espie <espie@openbsd.org> | 2008-03-08 16:24:44 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2008-03-08 16:24:44 +0000 |
| commit | f6f19d492e637516785dd83be6652e16d93413e9 (patch) | |
| tree | 8f1b6e02dc6cfc086ef88766641b1f572814cd56 | |
| parent | SUNW,set-trap-table takes an extra argument on sun4v; sun4u doesn't seem to (diff) | |
| download | wireguard-openbsd-f6f19d492e637516785dd83be6652e16d93413e9.tar.xz wireguard-openbsd-f6f19d492e637516785dd83be6652e16d93413e9.zip | |
allows SMALL_KERNEL compiles
okay damien@
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 8292f359e81..71f793a9bac 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.16 2007/11/30 19:19:47 damien Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.17 2008/03/08 16:24:44 espie Exp $ */ /*- * Copyright (c) 2007 @@ -72,7 +72,9 @@ static const struct pci_matchid iwn_devices[] = { int iwn_match(struct device *, void *, void *); void iwn_attach(struct device *, struct device *, void *); +#ifndef SMALL_KERNEL void iwn_sensor_attach(struct iwn_softc *); +#endif void iwn_radiotap_attach(struct iwn_softc *); void iwn_power(int, void *); int iwn_dma_contig_alloc(bus_dma_tag_t, struct iwn_dma_info *, @@ -331,7 +333,9 @@ iwn_attach(struct device *parent, struct device *self, void *aux) sc->amrr.amrr_min_success_threshold = 1; sc->amrr.amrr_max_success_threshold = 15; +#ifndef SMALL_KERNEL iwn_sensor_attach(sc); +#endif iwn_radiotap_attach(sc); timeout_set(&sc->calib_to, iwn_calib_timeout, sc); @@ -349,6 +353,7 @@ fail2: iwn_free_kw(sc); fail1: iwn_free_fwmem(sc); } +#ifndef SMALL_KERNEL /* * Attach the adapter's on-board thermal sensor to the sensors framework. */ @@ -364,6 +369,7 @@ iwn_sensor_attach(struct iwn_softc *sc) sensor_attach(&sc->sensordev, &sc->sensor); sensordev_install(&sc->sensordev); } +#endif /* * Attach the interface to 802.11 radiotap. diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index d608e619b3a..f0cd31a8a1e 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.58 2007/11/19 19:34:25 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.59 2008/03/08 16:24:45 espie Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -72,7 +72,9 @@ static const struct pci_matchid wpi_devices[] = { int wpi_match(struct device *, void *, void *); void wpi_attach(struct device *, struct device *, void *); +#ifndef SMALL_KERNEL void wpi_sensor_attach(struct wpi_softc *); +#endif void wpi_radiotap_attach(struct wpi_softc *); void wpi_power(int, void *); int wpi_dma_contig_alloc(bus_dma_tag_t, struct wpi_dma_info *, @@ -308,7 +310,9 @@ wpi_attach(struct device *parent, struct device *self, void *aux) sc->amrr.amrr_min_success_threshold = 1; sc->amrr.amrr_max_success_threshold = 15; +#ifndef SMALL_KERNEL wpi_sensor_attach(sc); +#endif wpi_radiotap_attach(sc); timeout_set(&sc->calib_to, wpi_calib_timeout, sc); @@ -325,6 +329,7 @@ fail2: wpi_free_shared(sc); fail1: wpi_free_fwmem(sc); } +#ifndef SMALL_KERNEL /* * Attach the adapter's on-board thermal sensor to the sensors framework. */ @@ -342,6 +347,7 @@ wpi_sensor_attach(struct wpi_softc *sc) sensor_attach(&sc->sensordev, &sc->sensor); sensordev_install(&sc->sensordev); } +#endif /* * Attach the interface to 802.11 radiotap. |