diff options
| author | peter <peter@FreeBSD.org> | 2000-01-29 18:01:10 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-01-29 18:01:10 +0000 |
| commit | 59db460dbc312ca297cad9a05c166963f9258c14 (patch) | |
| tree | 9d7e438bb4093df5c500730b09441baa341532b6 /sys/i386/isa/isa_device.h | |
| parent | 1caa831a53a848a88ec15cbfbb3fc5c29277395f (diff) | |
| download | FreeBSD-src-59db460dbc312ca297cad9a05c166963f9258c14.zip FreeBSD-src-59db460dbc312ca297cad9a05c166963f9258c14.tar.gz | |
Zap isa_device -> id_conflicts. The sole user of it (userconfig) never
actually used it since the only device that specified it (vga0) was marked
as "FLG_INVISIBLE" in userconfig and therefore never shown.
Suggested by: bde
Diffstat (limited to 'sys/i386/isa/isa_device.h')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 9f5484c..0a86c0b 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -49,11 +49,6 @@ /* * Per device structure. - * - * XXX Note: id_conflicts should either become an array of things we're - * specifically allowed to conflict with or be subsumed into some - * more powerful mechanism for detecting and dealing with multiple types - * of non-fatal conflict. -jkh XXX */ struct isa_device { int id_id; /* device id */ @@ -73,7 +68,6 @@ struct isa_device { int id_unit; /* unit number */ int id_flags; /* flags */ int id_enabled; /* is device enabled */ - int id_conflicts; /* we're allowed to conflict with things */ struct isa_device *id_next; /* used in isa_devlist in userconfig() */ struct device *id_device; /* new-bus wrapper device */ }; |
