summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/aic7xxx/93cx6.h4
-rw-r--r--sys/dev/aic7xxx/aic7xxx_93cx6.h4
-rw-r--r--sys/dev/atkbdc/atkbdcreg.h4
-rw-r--r--sys/dev/atkbdc/atkbdreg.h4
-rw-r--r--sys/dev/bktr/ioctl_meteor.h4
-rw-r--r--sys/dev/dpt/dpt.h4
-rw-r--r--sys/dev/fb/fbreg.h4
-rw-r--r--sys/dev/fb/vgareg.h4
-rw-r--r--sys/dev/iicbus/if_ic.c4
-rw-r--r--sys/dev/kbd/atkbdcreg.h4
-rw-r--r--sys/dev/kbd/atkbdreg.h4
-rw-r--r--sys/dev/kbd/kbdreg.h4
-rw-r--r--sys/dev/mii/miivar.h4
-rw-r--r--sys/dev/ppbus/immio.c8
-rw-r--r--sys/dev/ppbus/lpbb.c4
-rw-r--r--sys/dev/ppbus/lpt.c8
-rw-r--r--sys/dev/ppbus/ppi.h2
-rw-r--r--sys/dev/ppbus/vpo.c12
-rw-r--r--sys/dev/ppbus/vpoio.c8
-rw-r--r--sys/dev/sound/pcm/sound.h10
-rw-r--r--sys/dev/usb/usb.h4
-rw-r--r--sys/dev/vinum/vinumext.h4
-rw-r--r--sys/dev/vinum/vinumhdr.h6
-rw-r--r--sys/dev/vinum/vinumparser.c6
-rw-r--r--sys/dev/vinum/vinumutil.c6
-rw-r--r--sys/dev/vinum/vinumvar.h2
-rw-r--r--sys/dev/wi/if_wavelan_ieee.h2
27 files changed, 68 insertions, 66 deletions
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h
index b169483..ee013c2 100644
--- a/sys/dev/aic7xxx/93cx6.h
+++ b/sys/dev/aic7xxx/93cx6.h
@@ -42,7 +42,7 @@
#include <sys/systm.h>
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
typedef enum {
C46 = 6,
@@ -92,4 +92,4 @@ struct seeprom_descriptor {
int read_seeprom(struct seeprom_descriptor *sd, u_int16_t *buf,
bus_size_t start_addr, bus_size_t count);
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index b169483..ee013c2 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -42,7 +42,7 @@
#include <sys/systm.h>
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
typedef enum {
C46 = 6,
@@ -92,4 +92,4 @@ struct seeprom_descriptor {
int read_seeprom(struct seeprom_descriptor *sd, u_int16_t *buf,
bus_size_t start_addr, bus_size_t count);
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index 2085bb6..d01489e 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -133,7 +133,7 @@
#define PSM_BALLPOINT_ID 2
#define PSM_INTELLI_ID 3
-#ifdef KERNEL
+#ifdef _KERNEL
#define ATKBDC_DRIVER_NAME "atkbdc"
@@ -242,6 +242,6 @@ void kbdc_set_device_mask(KBDC kbdc, int mask);
int get_controller_command_byte(KBDC kbdc);
int set_controller_command_byte(KBDC kbdc, int command, int flag);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_DEV_KBD_ATKBDCREG_H_ */
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index bda6afb..46405c6 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -36,12 +36,12 @@
#define KB_CONF_NO_RESET (1 << 1) /* don't reset the keyboard */
#define KB_CONF_ALT_SCANCODESET (1 << 2) /* assume the XT type keyboard */
-#ifdef KERNEL
+#ifdef _KERNEL
int atkbd_probe_unit(int unit, int port, int irq, int flags);
int atkbd_attach_unit(int unit, keyboard_t **kbd,
int port, int irq, int flags);
-#endif /* KERNEL */
+#endif
#endif /* !_DEV_KBD_ATKBDREG_H_ */
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index 919100f..f62d392 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -27,6 +27,8 @@
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
/*
* ioctl constants for Matrox Meteor Capture card.
@@ -35,7 +37,7 @@
#ifndef _MACHINE_IOCTL_METEOR_H_
#define _MACHINE_IOCTL_METEOR_H_
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/types.h>
#endif
#include <sys/ioccom.h>
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 4d151eb..f2d1c22 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -1222,7 +1222,7 @@ typedef struct dpt_user_softc {
* These all come from dpt_scsi.c
*
*/
-#ifdef KERNEL
+#ifdef _KERNEL
/* This function gets the current hi-res time and returns it to the caller */
static __inline struct timeval
dpt_time_now(void)
@@ -1244,7 +1244,7 @@ dpt_minor2unit(int minor)
dpt_softc_t *dpt_minor2softc(int minor_no);
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* This function substracts one timval structure from another,
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index 0dc2016..7070f19 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -29,7 +29,7 @@
#ifndef _DEV_FB_FBREG_H_
#define _DEV_FB_FBREG_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#define V_MAX_ADAPTERS 8 /* XXX */
@@ -205,6 +205,6 @@ void fb_dump_mode_info(char *driver, video_adapter_t *adp,
int fb_type(int adp_type);
int fb_commonioctl(video_adapter_t *adp, u_long cmd, caddr_t arg);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_DEV_FB_FBREG_H_ */
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index 94c65e0..d50e5f2 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -64,7 +64,7 @@
#define VGA_UNIT(dev) minor(dev)
#define VGA_MKMINOR(unit) (unit)
-#ifdef KERNEL
+#ifdef _KERNEL
struct video_adapter;
typedef struct vga_softc {
@@ -92,6 +92,6 @@ int vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset,
extern int (*vga_sub_configure)(int flags);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _DEV_FB_VGAREG_H_ */
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 97dc5ea..2342956 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -30,7 +30,7 @@
* I2C bus IP driver
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -48,7 +48,7 @@
#include <net/if_types.h>
#include <net/netisr.h>
-#endif /* KERNEL */
+#endif
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <net/netisr.h>
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index 2085bb6..d01489e 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/atkbdcreg.h
@@ -133,7 +133,7 @@
#define PSM_BALLPOINT_ID 2
#define PSM_INTELLI_ID 3
-#ifdef KERNEL
+#ifdef _KERNEL
#define ATKBDC_DRIVER_NAME "atkbdc"
@@ -242,6 +242,6 @@ void kbdc_set_device_mask(KBDC kbdc, int mask);
int get_controller_command_byte(KBDC kbdc);
int set_controller_command_byte(KBDC kbdc, int command, int flag);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_DEV_KBD_ATKBDCREG_H_ */
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index bda6afb..46405c6 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -36,12 +36,12 @@
#define KB_CONF_NO_RESET (1 << 1) /* don't reset the keyboard */
#define KB_CONF_ALT_SCANCODESET (1 << 2) /* assume the XT type keyboard */
-#ifdef KERNEL
+#ifdef _KERNEL
int atkbd_probe_unit(int unit, int port, int irq, int flags);
int atkbd_attach_unit(int unit, keyboard_t **kbd,
int port, int irq, int flags);
-#endif /* KERNEL */
+#endif
#endif /* !_DEV_KBD_ATKBDREG_H_ */
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 83696bb..1312b04 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -164,7 +164,7 @@ typedef struct keyboard_driver {
int (*configure)(int); /* backdoor for the console driver */
} keyboard_driver_t;
-#ifdef KERNEL
+#ifdef _KERNEL
#define KEYBOARD_DRIVER(name, sw, config) \
static struct keyboard_driver name##_kbd_driver = { \
@@ -252,6 +252,6 @@ int genkbd_commonioctl(keyboard_t *kbd, u_long cmd, caddr_t arg);
int genkbd_keyaction(keyboard_t *kbd, int keycode, int down,
int *shiftstate, int *accents);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_DEV_KBD_KBDREG_H_ */
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 52380fa..4a68b9c 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -144,7 +144,7 @@ struct mii_attach_args {
};
typedef struct mii_attach_args mii_attach_args_t;
-#ifdef KERNEL
+#ifdef _KERNEL
#define PHY_READ(p, r) \
MIIBUS_READREG((p)->mii_dev, (p)->mii_phy, (r))
@@ -173,6 +173,6 @@ int mii_phy_auto __P((struct mii_softc *, int));
void mii_phy_reset __P((struct mii_softc *));
void ukphy_status __P((struct mii_softc *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _DEV_MII_MIIVAR_H_ */
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index a744dc8..e10f9a1 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -33,7 +33,7 @@
* Thanks to David Campbell work on the Linux driver and the Iomega specs
* Thanks to Thiebault Moeglin for the drive
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -41,11 +41,11 @@
#include <machine/clock.h>
-#endif /* KERNEL */
+#endif /* _KERNEL */
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/kernel.h>
-#endif /*KERNEL */
+#endif /* _KERNEL */
#include "opt_vpo.h"
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 7d4ba59..b98f80e2 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -103,14 +103,14 @@ static int lpbb_ppb_attach(struct ppb_device *dev);
static struct lpbb_softc *lpbbdata[MAXLPBB];
static int nlpbb = 0;
-#ifdef KERNEL
+#ifdef _KERNEL
static struct ppb_driver lpbbdriver = {
lpbb_ppb_probe, lpbb_ppb_attach, "lpbb"
};
DATA_SET(ppbdriver_set, lpbbdriver);
-#endif /* KERNEL */
+#endif
static int
lpbb_probe(device_t dev)
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 7120321..531ad48 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -62,7 +62,7 @@
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@
#include <machine/clock.h>
#include <machine/lpt.h>
-#endif /*KERNEL*/
+#endif
#include <dev/ppbus/ppbconf.h>
#include <dev/ppbus/ppb_1284.h>
@@ -154,14 +154,14 @@ static void lptintr(int unit);
static void lpt_intr(int unit); /* without spls */
-#ifdef KERNEL
+#ifdef _KERNEL
static struct ppb_driver lptdriver = {
lptprobe, lptattach, LPT_NAME
};
DATA_SET(ppbdriver_set, lptdriver);
-#endif /* KERNEL */
+#endif
/* bits for state */
#define OPEN (1<<0) /* device is open */
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 7d854e3..8ff2fb4 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -29,7 +29,7 @@
#ifndef __PPI_H
#define __PPI_H
-#ifndef KERNEL
+#ifndef _KERNEL
# include <sys/types.h>
#endif
#include <sys/ioccom.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index a6801f2..23e6058 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -27,7 +27,7 @@
*
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -35,7 +35,7 @@
#include <machine/clock.h>
-#endif /* KERNEL */
+#endif /* _KERNEL */
#include <cam/cam.h>
#include <cam/cam_ccb.h>
@@ -47,9 +47,9 @@
#include <cam/scsi/scsi_message.h>
#include <cam/scsi/scsi_da.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/kernel.h>
-#endif /*KERNEL */
+#endif
#include "opt_vpo.h"
@@ -87,7 +87,7 @@ static int nvpo = 0;
#define MAXVP0 8 /* XXX not much better! */
static struct vpo_data *vpodata[MAXVP0];
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Make ourselves visible as a ppbus driver
@@ -100,7 +100,7 @@ static struct ppb_driver vpodriver = {
};
DATA_SET(ppbdriver_set, vpodriver);
-#endif /* KERNEL */
+#endif
/*
* vpoprobe()
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index b158229..73e4adb 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -27,7 +27,7 @@
*
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -35,11 +35,11 @@
#include <machine/clock.h>
-#endif /* KERNEL */
+#endif
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/kernel.h>
-#endif /*KERNEL */
+#endif
#include "opt_vpo.h"
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 5f34e50..4bb2c93 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -27,7 +27,7 @@
* $FreeBSD$
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include "pcm.h"
#else
#error why?
@@ -42,7 +42,7 @@
#ifndef _OS_H_
#define _OS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ioccom.h>
@@ -85,7 +85,7 @@ struct isa_device { int dummy; };
#define d_write_t void
#define d_ioctl_t void
#define d_select_t void
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _OS_H_ */
@@ -146,7 +146,7 @@ int fkchan_setup(pcm_channel *c);
#define ON 1
#define OFF 0
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* some macros for debugging purposes
@@ -167,7 +167,7 @@ u_int32_t pcm_getflags(device_t dev);
void pcm_setflags(device_t dev, u_int32_t val);
void pcm_setswap(device_t dev, pcm_swap_t *swap);
-#endif /* KERNEL */
+#endif /* _KERNEL */
/* usage of flags in device config entry (config file) */
#define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 5f1c7fbd..7ed338c 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -53,7 +53,7 @@
#endif /* _KERNEL */
#elif defined(__FreeBSD__)
-#if defined(KERNEL)
+#if defined(_KERNEL)
#include <sys/malloc.h>
MALLOC_DECLARE(M_USB);
@@ -61,7 +61,7 @@ MALLOC_DECLARE(M_USBDEV);
MALLOC_DECLARE(M_USBHC);
#include <dev/usb/usb_port.h>
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* __FreeBSD__ */
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index da205d2..77cbba3 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -51,12 +51,12 @@ extern int debug; /* debug flags */
printf (msg); \
longjmp (command_fail, -1); \
}
-#ifndef KERNEL
+#ifndef _KERNEL
struct vnode;
struct proc;
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
int vinum_inactive(int);
void free_vinum(int);
int give_sd_to_plex(int plexno, int sdno);
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 810cc7a..9fa4f58 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -41,7 +41,7 @@
*/
#include <sys/param.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_vinum.h"
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -62,7 +62,7 @@
#include <sys/fcntl.h>
#include <sys/vnode.h>
#include <sys/queue.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <machine/setjmp.h>
#include <machine/stdarg.h>
#else
@@ -77,7 +77,7 @@
#include <machine/cpu.h>
#undef Free /* defined in some funny net stuff */
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef VINUMDEBUG
#define Malloc(x) MMalloc ((x), __FILE__, __LINE__) /* show where we came from */
#define Free(x) FFree ((x), __FILE__, __LINE__) /* show where we came from */
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index e0a8609..0acdd26 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -57,7 +57,7 @@
*/
#include <sys/param.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#else
#include <ctype.h>
@@ -115,7 +115,7 @@ struct _keywords keywords[] =
keypair(prefer),
keypair(rename),
keypair(detached),
-#ifndef KERNEL /* for vinum(8) only */
+#ifndef _KERNEL /* for vinum(8) only */
#ifdef VINUMDEBUG
keypair(debug),
keypair(stripe),
@@ -159,7 +159,7 @@ struct _keywords keywords[] =
};
struct keywordset keyword_set = KEYWORDSET(keywords);
-#ifndef KERNEL
+#ifndef _KERNEL
struct _keywords flag_keywords[] =
{flagkeypair(f),
flagkeypair(d),
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index 45b8bde..fe3b99f 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -42,7 +42,7 @@
#include <dev/vinum/vinumhdr.h>
#include <dev/vinum/statetexts.h>
-#ifndef KERNEL
+#ifndef _KERNEL
#include <stdio.h>
extern jmp_buf command_fail; /* return on a failed command */
#endif
@@ -219,14 +219,14 @@ sizespec(char *spec)
return size * sign * 1024 * 1024 * 1024;
}
}
-#ifdef KERNEL
+#ifdef _KERNEL
throw_rude_remark(EINVAL, "Invalid length specification: %s", spec);
#else
fprintf(stderr, "Invalid length specification: %s", spec);
longjmp(command_fail, -1);
#endif
}
-#ifdef KERNEL
+#ifdef _KERNEL
throw_rude_remark(EINVAL, "Missing length specification");
#else
fprintf(stderr, "Missing length specification");
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 3cc18a3..1121285 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -643,7 +643,7 @@ enum debugflags {
DEBUG_WARNINGS = 512, /* log various relatively harmless warnings */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#define longjmp LongJmp /* test our longjmps */
#endif
#endif
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index 8ce57f9..5e5d2e3 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -145,7 +145,7 @@ struct wi_sigcache {
};
#endif
-#ifndef KERNEL
+#ifndef _KERNEL
struct wi_counters {
u_int32_t wi_tx_unicast_frames;
u_int32_t wi_tx_multicast_frames;
OpenPOWER on IntegriCloud