diff options
| -rw-r--r-- | usr.sbin/config/config.h | 1 | ||||
| -rw-r--r-- | usr.sbin/config/config.y | 5 | ||||
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 183e6f4..5d1ff48 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -86,7 +86,6 @@ struct device { #define QUES -1 /* -1 means '?' */ #define UNKNOWN -2 /* -2 means not set yet */ int d_flags; /* flags for device init */ - int d_conflicts; /* I'm allowed to conflict */ int d_disabled; /* nonzero to skip probe/attach */ char *d_port; /* io port base manifest constant */ int d_portn; /* io port base (if number not manifest) */ 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 = \ diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 542b1c7..6eabd49 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -95,10 +95,6 @@ write_device_resources(FILE *fp, struct device *dp) fprintf(fp, "\t{ \"flags\",\tRES_INT,\t{ 0x%x }},\n", dp->d_flags); count++; } - if (dp->d_conflicts) { - fprintf(fp, "\t{ \"conflicts\",\tRES_INT,\t{ %d }},\n", dp->d_conflicts); - count++; - } if (dp->d_disabled) { fprintf(fp, "\t{ \"disabled\",\tRES_INT,\t{ %d }},\n", dp->d_disabled); count++; |
