Change LINT_PCCARD_HACK to COMPILING_LINT, and put it in its own header file
"opt_lint.h". This should prevent the next person needing the same trick from inventing their own option, too.
This commit is contained in:
eivind
parent
f1dfb39044
commit
a38d8f1201
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.399 1998/01/31 07:23:07 eivind Exp $
|
||||
# $Id: LINT,v 1.400 1998/01/31 19:41:27 julian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -294,6 +294,16 @@ options DIAGNOSTIC
|
||||
#
|
||||
options PERFMON
|
||||
|
||||
|
||||
#
|
||||
# This option let some drivers co-exist that can't co-exist in a running
|
||||
# system. This is used to be able to compile all kernel code in one go for
|
||||
# quality assurance purposes (like this file, which the option takes it name
|
||||
# from.)
|
||||
#
|
||||
options COMPILING_LINT
|
||||
|
||||
|
||||
# XXX - this doesn't belong here.
|
||||
# Allow ordinary users to take the console - this is useful for X.
|
||||
options UCONSOLE
|
||||
@ -975,9 +985,8 @@ device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr
|
||||
options WLCACHE # enables the signal-strength cache
|
||||
options WLDEBUG # enables verbose debugging output
|
||||
device wl0 at isa? port 0x300 net irq ? vector wlintr
|
||||
# Needed so that we can (bogusly) include both the dedicated PCCARD
|
||||
# drivers and the generic support
|
||||
options LINT_PCCARD_HACK
|
||||
# We can (bogusly) include both the dedicated PCCARD drivers and the generic
|
||||
# support when COMPILING_LINT.
|
||||
device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
|
||||
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: options,v 1.55 1998/02/04 03:59:50 eivind Exp $
|
||||
# $Id: options,v 1.56 1998/02/04 04:12:27 eivind Exp $
|
||||
|
||||
# Format:
|
||||
# Option name filename
|
||||
@ -7,6 +7,7 @@
|
||||
BOUNCE_BUFFERS opt_bounce.h
|
||||
COMPAT_43 opt_compat.h
|
||||
COMPAT_SUNOS opt_compat.h
|
||||
COMPILING_LINT opt_lint.h
|
||||
DDB
|
||||
DDB_UNATTENDED opt_ddb.h
|
||||
GDB_REMOTE_CHAT opt_ddb.h
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.399 1998/01/31 07:23:07 eivind Exp $
|
||||
# $Id: LINT,v 1.400 1998/01/31 19:41:27 julian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -294,6 +294,16 @@ options DIAGNOSTIC
|
||||
#
|
||||
options PERFMON
|
||||
|
||||
|
||||
#
|
||||
# This option let some drivers co-exist that can't co-exist in a running
|
||||
# system. This is used to be able to compile all kernel code in one go for
|
||||
# quality assurance purposes (like this file, which the option takes it name
|
||||
# from.)
|
||||
#
|
||||
options COMPILING_LINT
|
||||
|
||||
|
||||
# XXX - this doesn't belong here.
|
||||
# Allow ordinary users to take the console - this is useful for X.
|
||||
options UCONSOLE
|
||||
@ -975,9 +985,8 @@ device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr
|
||||
options WLCACHE # enables the signal-strength cache
|
||||
options WLDEBUG # enables verbose debugging output
|
||||
device wl0 at isa? port 0x300 net irq ? vector wlintr
|
||||
# Needed so that we can (bogusly) include both the dedicated PCCARD
|
||||
# drivers and the generic support
|
||||
options LINT_PCCARD_HACK
|
||||
# We can (bogusly) include both the dedicated PCCARD drivers and the generic
|
||||
# support when COMPILING_LINT.
|
||||
device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
|
||||
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.399 1998/01/31 07:23:07 eivind Exp $
|
||||
# $Id: LINT,v 1.400 1998/01/31 19:41:27 julian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -294,6 +294,16 @@ options DIAGNOSTIC
|
||||
#
|
||||
options PERFMON
|
||||
|
||||
|
||||
#
|
||||
# This option let some drivers co-exist that can't co-exist in a running
|
||||
# system. This is used to be able to compile all kernel code in one go for
|
||||
# quality assurance purposes (like this file, which the option takes it name
|
||||
# from.)
|
||||
#
|
||||
options COMPILING_LINT
|
||||
|
||||
|
||||
# XXX - this doesn't belong here.
|
||||
# Allow ordinary users to take the console - this is useful for X.
|
||||
options UCONSOLE
|
||||
@ -975,9 +985,8 @@ device sr0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector srintr
|
||||
options WLCACHE # enables the signal-strength cache
|
||||
options WLDEBUG # enables verbose debugging output
|
||||
device wl0 at isa? port 0x300 net irq ? vector wlintr
|
||||
# Needed so that we can (bogusly) include both the dedicated PCCARD
|
||||
# drivers and the generic support
|
||||
options LINT_PCCARD_HACK
|
||||
# We can (bogusly) include both the dedicated PCCARD drivers and the generic
|
||||
# support when COMPILING_LINT.
|
||||
device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
|
||||
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
|
||||
|
||||
|
||||
@ -47,14 +47,16 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: if_ze.c,v 1.47 1997/12/15 20:30:54 eivind Exp $
|
||||
* $Id: if_ze.c,v 1.48 1998/01/08 23:41:06 eivind Exp $
|
||||
*/
|
||||
|
||||
/* XXX - Don't mix different PCCARD support code */
|
||||
#include "opt_lint.h"
|
||||
|
||||
#include "card.h"
|
||||
#include "pcic.h"
|
||||
#if NCARD > 0 || NPCIC > 0
|
||||
#ifndef LINT_PCCARD_HACK
|
||||
#ifndef COMPILING_LINT
|
||||
#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
|
||||
#else
|
||||
#warning "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
|
||||
* $Id: if_zp.c,v 1.42 1997/12/15 20:30:56 eivind Exp $
|
||||
* $Id: if_zp.c,v 1.43 1998/01/08 23:41:08 eivind Exp $
|
||||
*/
|
||||
/*-
|
||||
* TODO:
|
||||
@ -101,10 +101,12 @@
|
||||
*/
|
||||
|
||||
/* XXX - Don't mix different PCCARD support code */
|
||||
#include "opt_lint.h"
|
||||
|
||||
#include "card.h"
|
||||
#include "pcic.h"
|
||||
#if NCARD > 0 || NPCIC > 0
|
||||
#ifndef LINT_PCCARD_HACK
|
||||
#ifndef COMPILING_LINT
|
||||
#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
|
||||
#else
|
||||
#warning "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user