summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
committerpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
commitd53e4c1d809338e9b317d95bdded2f7f7a986556 (patch)
tree916004bdaa3cf47d2a92effe8c981e7d1ff5ccec /sys/pci
parent15b9bcb121e1f3735a2c98a11afdb52a03301d7e (diff)
downloadFreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.zip
FreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.tar.gz
Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"
is an application space macro and the applications are supposed to be free to use it as they please (but cannot). This is consistant with the other BSD's who made this change quite some time ago. More commits to come.
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_mn.c4
-rw-r--r--sys/pci/ncr.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 243d2ff..ce4e3e6 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -47,7 +47,7 @@ struct mn_control {
unsigned ts[M32_CHAN];
};
-#ifdef KERNEL
+#ifdef _KERNEL
#define PPP_HEADER_LEN 4 /* XXX: should live in some header somewhere */
#include <sys/param.h>
@@ -1287,4 +1287,4 @@ mn_attach (pcici_t tag, int unit)
return;
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 7cc760f..26de939 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -46,9 +46,9 @@
#define NCR_GETCC_WITHMSG
-#if defined (__FreeBSD__) && defined(KERNEL)
+#if defined (__FreeBSD__) && defined(_KERNEL)
#include "opt_ncr.h"
-#endif /* defined(KERNEL) */
+#endif
/*==========================================================
**
@@ -175,7 +175,7 @@
#include <sys/param.h>
#include <sys/time.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/buf.h>
@@ -186,7 +186,7 @@
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#endif /* KERNEL */
+#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
@@ -1304,7 +1304,7 @@ struct scripth {
**==========================================================
*/
-#ifdef KERNEL
+#ifdef _KERNEL
static nccb_p ncr_alloc_nccb (ncb_p np, u_long target, u_long lun);
static void ncr_complete (ncb_p np, nccb_p cp);
static int ncr_delta (int * from, int * to);
@@ -1346,7 +1346,7 @@ static void ncr_wakeup (ncb_p np, u_long code);
static const char* ncr_probe (pcici_t tag, pcidi_t type);
static void ncr_attach (pcici_t tag, int unit);
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*==========================================================
**
@@ -1369,7 +1369,7 @@ static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct lcb) * 3
+ (u_long) sizeof (struct tcb) * 2;
-#ifdef KERNEL
+#ifdef _KERNEL
static const int nncr=MAX_UNITS; /* XXX to be replaced by SYSCTL */
static ncb_p ncrp [MAX_UNITS]; /* XXX to be replaced by SYSCTL */
@@ -7198,4 +7198,4 @@ printf ("Sum = %04x\n", sum);
#endif /* NCR_TEKRAM_EEPROM */
/*=========================================================================*/
-#endif /* KERNEL */
+#endif /* _KERNEL */
OpenPOWER on IntegriCloud