summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-06-23 14:41:55 +0000
committerbde <bde@FreeBSD.org>1996-06-23 14:41:55 +0000
commit5258916985597fe55bdf315b539b93b831b638ce (patch)
treef987a8697d46cf4412d402ca25315fcb07e85974
parentb2263f0583ea30044d4242034bf7739a5c0387ad (diff)
downloadFreeBSD-src-5258916985597fe55bdf315b539b93b831b638ce.zip
FreeBSD-src-5258916985597fe55bdf315b539b93b831b638ce.tar.gz
Don't (re)define or use ACTUALLY_LKM_NOT_KERNEL - use the existing
definition of QCAM_MODULE for everything involving LKM'ness. Makefile: Don't add -I/sys to CFLAGS. bsd.kmod.mk adds the correct (relative) path.
-rw-r--r--lkm/qcam/Makefile2
-rw-r--r--sys/i386/isa/qcam.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lkm/qcam/Makefile b/lkm/qcam/Makefile
index 18a2046..51bbafe 100644
--- a/lkm/qcam/Makefile
+++ b/lkm/qcam/Makefile
@@ -3,7 +3,7 @@ KMOD = qcam_mod
SRCS = qcam.c qcamio.c qcam.h
MAN8 = qcam.8
-CFLAGS += -I. -I/sys -DQCAM_MODULE -DACTUALLY_LKM_NOT_KERNEL
+CFLAGS += -I. -DQCAM_MODULE
CLEANFILES += qcam.h
qcam.h:
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index 837b391d..e1f2e81 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -145,7 +145,7 @@ qcam_registerdev (struct isa_device *id)
kdc->kdc_unit = id->id_unit;
kdc->kdc_parentdata = id;
-#ifndef ACTUALLY_LKM_NOT_KERNEL /* there's a bug in dev_attach
+#ifndef QCAM_MODULE /* there's a bug in dev_attach
when running from an LKM */
dev_attach(kdc);
#endif
OpenPOWER on IntegriCloud