summaryrefslogtreecommitdiffstats
path: root/usr.sbin/config/config.y
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2000-01-29 18:14:59 +0000
committerpeter <peter@FreeBSD.org>2000-01-29 18:14:59 +0000
commit91ca8fff8641d6fec72ec0435a8c50aff02a411b (patch)
tree5b32959d6a5551da20652f0732788abdb531245c /usr.sbin/config/config.y
parent25c1fa20e1d188d3603f7b884702574141942b6b (diff)
downloadFreeBSD-src-91ca8fff8641d6fec72ec0435a8c50aff02a411b.zip
FreeBSD-src-91ca8fff8641d6fec72ec0435a8c50aff02a411b.tar.gz
Mark the 'conflicts' keyword as obsolete, and don't generate (unused)
resource table entries for it.
Diffstat (limited to 'usr.sbin/config/config.y')
-rw-r--r--usr.sbin/config/config.y5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index d6da904..018be5b 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -400,7 +400,9 @@ Info:
DISABLE
= { cur.d_disabled = 1; } |
CONFLICTS
- = { cur.d_conflicts = 1; };
+ = {
+ warnx("line %d: Obsolete keyword 'conflicts' found", yyline);
+ };
%%
@@ -489,7 +491,6 @@ init_dev(dp)
dp->d_name = "OHNO!!!";
dp->d_type = DEVICE;
dp->d_conn = 0;
- dp->d_conflicts = 0;
dp->d_disabled = 0;
dp->d_flags = 0;
dp->d_bus = dp->d_lun = dp->d_target = dp->d_drive = dp->d_unit = \
OpenPOWER on IntegriCloud