diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-11 07:41:52 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-11 07:41:52 +0000 |
| commit | 561eb80e564511caf11e035642fba1a429106466 (patch) | |
| tree | ad76bab50e657bb2a2375b96b4cd0792353a8d31 /sys/i386/isa/isa_device.h | |
| parent | 6b36fe2f86aca870f4fcd055248ca4c2968544f3 (diff) | |
| download | FreeBSD-src-561eb80e564511caf11e035642fba1a429106466.zip FreeBSD-src-561eb80e564511caf11e035642fba1a429106466.tar.gz | |
Move conflicts flag to the end.
Diffstat (limited to 'sys/i386/isa/isa_device.h')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 5ef4e67..4e3c08c 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.21 1995/04/23 09:13:08 julian Exp $ + * $Id: isa_device.h,v 1.22 1995/05/11 02:15:55 jkh Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -74,13 +74,13 @@ struct isa_device { inthand2_t *id_intr; /* interrupt interface routine */ int id_unit; /* unit number */ int id_flags; /* flags */ - int id_conflicts; /* we're allowed to conflict with things */ int id_scsiid; /* scsi id if needed */ int id_alive; /* device is present */ #define RI_FAST 1 /* fast interrupt handler */ u_int id_ri_flags; /* flags for register_intr() */ int id_reconfig; /* hot eject device support (such as PCMCIA) */ 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() */ }; |
