diff options
| author | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
| commit | 0efea177e37295fed654875d875160c47500d6bd (patch) | |
| tree | 9d0589344a5d07b9a511a2e81ebbd701744d03b5 /sys/dev | |
| parent | 0f81d3e0a26c2833cd085c472a4a77c325486b75 (diff) | |
Remove LKMs and switch to the module framework, pass 1.
Proposed on tech-kern@.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ataconf.h | 6 | ||||
| -rw-r--r-- | sys/dev/ic/an.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ath_netbsd.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtw.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/wi.c | 8 | ||||
| -rw-r--r-- | sys/dev/ieee1394/firewire.c | 6 | ||||
| -rw-r--r-- | sys/dev/ieee1394/fwmem.c | 6 | ||||
| -rw-r--r-- | sys/dev/ieee1394/fwohci.c | 6 | ||||
| -rw-r--r-- | sys/dev/ieee1394/if_fwip.c | 6 | ||||
| -rw-r--r-- | sys/dev/ieee1394/sbp.c | 6 | ||||
| -rw-r--r-- | sys/dev/if_ndis/if_ndis.c | 4 | ||||
| -rw-r--r-- | sys/dev/if_ndis/if_ndis_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/isa/nsclpcsio_isa.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_lmc.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/if_lmc.h | 7 | ||||
| -rw-r--r-- | sys/dev/pci/n8/common/config.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/n8/nsp.c | 7 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 6 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 6 |
19 files changed, 57 insertions, 68 deletions
diff --git a/sys/dev/ata/ataconf.h b/sys/dev/ata/ataconf.h index b337393f872..479964e7668 100644 --- a/sys/dev/ata/ataconf.h +++ b/sys/dev/ata/ataconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: ataconf.h,v 1.1 2006/09/07 12:34:42 itohy Exp $ */ +/* $NetBSD: ataconf.h,v 1.2 2008/11/12 12:36:11 ad Exp $ */ /* * Written in 2006 by ITOH Yasufumi. @@ -8,9 +8,9 @@ #ifndef _DEV_ATA_ATACONF_H_ #define _DEV_ATA_ATACONF_H_ -#if !defined(_KERNEL_OPT) || defined(LKM) +#if !defined(_KERNEL_OPT) || defined(MODULAR) -/* compile-in everything for LKM or LKM-enabled kernel */ +/* compile-in everything for module or module-enabled kernel */ # define NATA_DMA 1 # define NATA_UDMA 1 # define NATA_PIOBM 1 diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index e5b78b5092c..11e9932cc2a 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $NetBSD: an.c,v 1.53 2008/11/07 00:20:02 dyoung Exp $ */ +/* $NetBSD: an.c,v 1.54 2008/11/12 12:36:11 ad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.53 2008/11/07 00:20:02 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.54 2008/11/12 12:36:11 ad Exp $"); #include "bpfilter.h" @@ -347,7 +347,7 @@ an_attach(struct an_softc *sc) /* * Setup sysctl(3) MIB, hw.an.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_an, "sysctl an(4) subtree setup") { diff --git a/sys/dev/ic/ath_netbsd.c b/sys/dev/ic/ath_netbsd.c index d1c4d41836d..b9ddca387dd 100644 --- a/sys/dev/ic/ath_netbsd.c +++ b/sys/dev/ic/ath_netbsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ath_netbsd.c,v 1.15 2008/07/09 19:47:24 joerg Exp $ */ +/* $NetBSD: ath_netbsd.c,v 1.16 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2003, 2004 David Young @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.15 2008/07/09 19:47:24 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.16 2008/11/12 12:36:11 ad Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -74,7 +74,7 @@ device_printf(device_t dev, const char *fmt, ...) /* * Setup sysctl(3) MIB, hw.ath.*. * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_ath, "sysctl ath subtree setup") { diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index bcad107b9c8..85058471c49 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtw.c,v 1.105 2008/11/07 00:20:03 dyoung Exp $ */ +/* $NetBSD: rtw.c,v 1.106 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights * reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.105 2008/11/07 00:20:03 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.106 2008/11/12 12:36:11 ad Exp $"); #include "bpfilter.h" @@ -135,7 +135,7 @@ static void rtw_txring_fixup(struct rtw_softc *sc, const char *fn, int ln); /* * Setup sysctl(3) MIB, hw.rtw.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_rtw, "sysctl rtw(4) subtree setup") { diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c index e58e248c09d..c0d0ffd9699 100644 --- a/sys/dev/ic/wi.c +++ b/sys/dev/ic/wi.c @@ -1,4 +1,4 @@ -/* $NetBSD: wi.c,v 1.227 2008/11/07 00:20:03 dyoung Exp $ */ +/* $NetBSD: wi.c,v 1.228 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -99,7 +99,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.227 2008/11/07 00:20:03 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.228 2008/11/12 12:36:11 ad Exp $"); #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ @@ -272,11 +272,11 @@ wi_card_ident[] = { { 0, NULL, 0 }, }; -#ifndef _LKM +#ifndef _MODULE /* * Setup sysctl(3) MIB, hw.wi.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_wi, "sysctl wi(4) subtree setup") { diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c index 66f48499612..6155a983149 100644 --- a/sys/dev/ieee1394/firewire.c +++ b/sys/dev/ieee1394/firewire.c @@ -1,4 +1,4 @@ -/* $NetBSD: firewire.c,v 1.21 2008/05/10 13:56:54 jmcneill Exp $ */ +/* $NetBSD: firewire.c,v 1.22 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.21 2008/05/10 13:56:54 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.22 2008/11/12 12:36:11 ad Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -122,7 +122,7 @@ MALLOC_DEFINE(M_FWXFER, "fw_xfer", "XFER/FireWire"); /* * Setup sysctl(3) MIB, hw.ieee1394if.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_ieee1394if, "sysctl ieee1394if(4) subtree setup") { diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c index 8842b0adc0b..4f0cb4f1a9b 100644 --- a/sys/dev/ieee1394/fwmem.c +++ b/sys/dev/ieee1394/fwmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwmem.c,v 1.8 2007/12/11 11:34:08 lukem Exp $ */ +/* $NetBSD: fwmem.c,v 1.9 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2002-2003 * Hidetoshi Shimokawa. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.8 2007/12/11 11:34:08 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.9 2008/11/12 12:36:11 ad Exp $"); #if defined(__FreeBSD__) __FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.34 2007/06/06 14:31:36 simokawa Exp $"); #endif @@ -115,7 +115,7 @@ static int sysctl_fwmem_verify_speed(SYSCTLFN_PROTO); /* * Setup sysctl(3) MIB, hw.fwmem.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_fwmem, "sysctl fwmem subtree setup") { diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index ef636a7c91a..02cbb7fd638 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.114 2008/05/10 13:56:54 jmcneill Exp $ */ +/* $NetBSD: fwohci.c,v 1.115 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa @@ -37,7 +37,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.114 2008/05/10 13:56:54 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.115 2008/11/12 12:36:11 ad Exp $"); #define ATRQ_CH 0 #define ATRS_CH 1 @@ -123,7 +123,7 @@ TUNABLE_INT("hw.firewire.phydma_enable", &firewire_phydma_enable); /* * Setup sysctl(3) MIB, hw.fwohci.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_fwohci, "sysctl fwohci(4) subtree setup") { diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c index 3163400d615..335b52439a7 100644 --- a/sys/dev/ieee1394/if_fwip.c +++ b/sys/dev/ieee1394/if_fwip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fwip.c,v 1.16 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_fwip.c,v 1.17 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2004 * Doug Rabson @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.16 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.17 2008/11/12 12:36:11 ad Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -158,7 +158,7 @@ MALLOC_DEFINE(M_FWIP, "if_fwip", "IP over IEEE1394 interface"); /* * Setup sysctl(3) MIB, hw.fwip.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_fwip, "sysctl fwip(4) subtree setup") { diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index 1a49edde241..a605186945c 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.21 2008/03/29 16:22:53 kiyohara Exp $ */ +/* $NetBSD: sbp.c,v 1.22 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.21 2008/03/29 16:22:53 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.22 2008/11/12 12:36:11 ad Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -201,7 +201,7 @@ static int sysctl_sbp_verify_tags(SYSCTLFN_PROTO); /* * Setup sysctl(3) MIB, hw.sbp.* * - * TBD condition CTLFLAG_PERMANENT on being an LKM or not + * TBD condition CTLFLAG_PERMANENT on being a module or not */ SYSCTL_SETUP(sysctl_sbp, "sysctl sbp(4) subtree setup") { diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 7b3db4b7733..e3cd23ef9ef 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.19 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.20 2008/11/12 12:36:11 ad Exp $"); #endif #ifdef __FreeBSD__ @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.19 2008/11/07 00:20:07 dyoung Exp $"); #ifdef __FreeBSD__ #include <sys/module.h> #else /* __NetBSD__ */ -#include <sys/lkm.h> +#include <sys/module.h> #endif #include <sys/proc.h> diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c index b04497769f1..3ab9a511353 100644 --- a/sys/dev/if_ndis/if_ndis_pci.c +++ b/sys/dev/if_ndis/if_ndis_pci.c @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.10 2008/04/08 06:12:21 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.11 2008/11/12 12:36:12 ad Exp $"); #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $"); #endif @@ -39,11 +39,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24 #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#ifdef __FreeBSD__ #include <sys/module.h> -#else -#include <sys/lkm.h> -#endif #include <sys/socket.h> #include <sys/queue.h> #include <sys/sysctl.h> diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c index bca408a921d..c29a1cadd03 100644 --- a/sys/dev/isa/nsclpcsio_isa.c +++ b/sys/dev/isa/nsclpcsio_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: nsclpcsio_isa.c,v 1.27 2008/04/04 13:10:41 xtraeme Exp $ */ +/* $NetBSD: nsclpcsio_isa.c,v 1.28 2008/11/12 12:36:12 ad Exp $ */ /* * Copyright (c) 2002 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.27 2008/04/04 13:10:41 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.28 2008/11/12 12:36:12 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,15 +41,15 @@ __KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.27 2008/04/04 13:10:41 xtraeme E #include <sys/gpio.h> #include <sys/bus.h> -/* Don't use gpio for now in the LKM */ -#ifdef _LKM +/* Don't use gpio for now in the module */ +#ifdef _MODULE #undef NGPIO #endif #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> -#ifndef _LKM +#ifndef _MODULE #include "gpio.h" #endif #if NGPIO > 0 diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index b6a9ce9f418..35779b854b1 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_lmc.c,v 1.45 2008/11/12 12:36:12 ad Exp $ */ /*- * Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us> @@ -142,7 +142,7 @@ #if defined(__NetBSD__) # include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.45 2008/11/12 12:36:12 ad Exp $"); # include <sys/param.h> /* OS version */ /* -DLKM is passed on the compiler command line */ # include "opt_inet.h" /* INET6, INET */ @@ -161,7 +161,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); # # include <sys/systm.h> # include <sys/kernel.h> -# include <sys/lkm.h> +# include <sys/module.h> # include <sys/mbuf.h> # include <sys/socket.h> # include <sys/sockio.h> @@ -216,7 +216,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.44 2008/11/07 00:20:07 dyoung Exp $"); # include <sys/kernel.h> # include <sys/conf.h> # include <sys/exec.h> -# include <sys/lkm.h> +# include <sys/module.h> # include <sys/mbuf.h> # include <sys/socket.h> # include <sys/sockio.h> @@ -7372,7 +7372,7 @@ struct cfattach lmc_ca = .ca_activate = NULL, }; -# if defined(LKM) +# if defined(_MODULE) struct cfdriver lmc_cd = { @@ -7479,7 +7479,7 @@ int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) return error; } -# endif /* LKM */ +# endif /* _MODULE */ #endif /* __OpenBSD__ */ diff --git a/sys/dev/pci/if_lmc.h b/sys/dev/pci/if_lmc.h index 4abb0d055d7..f2afe37df80 100644 --- a/sys/dev/pci/if_lmc.h +++ b/sys/dev/pci/if_lmc.h @@ -1,5 +1,5 @@ /*- - * $NetBSD: if_lmc.h,v 1.14 2008/09/08 23:36:54 gmcgarry Exp $ + * $NetBSD: if_lmc.h,v 1.15 2008/11/12 12:36:12 ad Exp $ * * Copyright (c) 2002-2006 David Boggs. (boggs@boggs.palo-alto.ca.us) * All rights reserved. @@ -1680,18 +1680,13 @@ static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int); static int nbsd_match(struct device *, struct cfdata *, void *); static void nbsd_attach(struct device *, struct device *, void *); static int nbsd_detach(struct device *, int); -# if defined(LKM) -int if_lmc_lkmentry(struct lkm_table *, int, int); -# endif #endif /* __NetBSD__ */ #if defined(__OpenBSD__) static int obsd_match(struct device *, void *, void *); static void obsd_attach(struct device *, struct device *, void *); static int obsd_detach(struct device *, int); -# if defined(LKM) int if_lmc_lkmentry(struct lkm_table *, int, int); -# endif #endif /* __OpenBSD__ */ #if defined(__bsdi__) diff --git a/sys/dev/pci/n8/common/config.c b/sys/dev/pci/n8/common/config.c index 294eb9f3657..b506f8e5bcf 100644 --- a/sys/dev/pci/n8/common/config.c +++ b/sys/dev/pci/n8/common/config.c @@ -32,7 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -static char const n8_id[] = "$Id: config.c,v 1.1 2008/10/30 12:02:14 darran Exp $"; +static char const n8_id[] = "$Id: config.c,v 1.2 2008/11/12 12:36:16 ad Exp $"; /*****************************************************************************/ /** @file config.c * @brief NSP2000 Device Driver Configuration Manager. @@ -172,8 +172,7 @@ static char const n8_id[] = "$Id: config.c,v 1.1 2008/10/30 12:02:14 darran Exp #include <sys/mbuf.h> #include <sys/device.h> #include <sys/queue.h> - -#include <sys/lkm.h> +#include <sys/module.h> #include <sys/bus.h> #include <uvm/uvm_extern.h> diff --git a/sys/dev/pci/n8/nsp.c b/sys/dev/pci/n8/nsp.c index a0a9032440d..f0a7d4b5e16 100644 --- a/sys/dev/pci/n8/nsp.c +++ b/sys/dev/pci/n8/nsp.c @@ -77,8 +77,7 @@ #include <sys/mbuf.h> #include <sys/device.h> #include <sys/queue.h> - -#include <sys/lkm.h> +#include <sys/module.h> #include <sys/bus.h> #include <uvm/uvm_extern.h> @@ -111,7 +110,7 @@ static void nsp_attach(struct device *parent, struct device *self, void *aux); static int nsp_detach(device_t dev, int flags); -#ifdef _LKM +#ifdef _MODULE CFATTACH_DECL(nsp2000, sizeof(struct nsp_softc), nsp_probe, nsp_attach, nsp_detach, NULL); int nsp2000_lkmentry(struct lkm_table *lkmtp, int cmd, int ver); @@ -149,7 +148,7 @@ nsp2000_lkmentry(struct lkm_table *lkmtp, int cmd, int ver) LKM_DISPATCH(lkmtp, cmd, NULL, lkm_nofunc, lkm_nofunc, lkm_nofunc); } -#else /* _LKM */ +#else /* _MODULE */ CFATTACH_DECL(nsp, sizeof(struct nsp_softc), nsp_probe, nsp_attach, nsp_detach, NULL); #endif diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index ccf31bcbd51..7dbe7caac4e 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_pcmcia.c,v 1.79 2008/04/28 20:23:56 martin Exp $ */ +/* $NetBSD: if_wi_pcmcia.c,v 1.80 2008/11/12 12:36:16 ad Exp $ */ /*- * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.79 2008/04/28 20:23:56 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.80 2008/11/12 12:36:16 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.79 2008/04/28 20:23:56 martin Exp #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -#ifdef _LKM +#ifdef _MODULE #define WI_PCMCIA_SPECTRUM24T_FW 1 #else #include <opt_if_wi_pcmcia.h> diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index acd048afd01..8ecf9b44a82 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.187 2008/09/24 07:57:30 ad Exp $ */ +/* $NetBSD: vnd.c,v 1.188 2008/11/12 12:36:11 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.187 2008/09/24 07:57:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.188 2008/11/12 12:36:11 ad Exp $"); #if defined(_KERNEL_OPT) #include "fs_nfs.h" @@ -194,7 +194,7 @@ struct vndxfer { #define VNDLABELDEV(dev) \ (MAKEDISKDEV(major((dev)), vndunit((dev)), RAW_PART)) -/* called by main() at boot time (XXX: and the LKM driver) */ +/* called by main() at boot time */ void vndattach(int); static void vndclear(struct vnd_softc *, int); |
