diff options
author | kato <kato@FreeBSD.org> | 1996-12-24 11:44:33 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1996-12-24 11:44:33 +0000 |
commit | 67efd9fff6e9ce1e90b2d527aacf42dd64ac2dbd (patch) | |
tree | 5593f6f79eb93e84f4715d3d04952e545e0c7c2c /sys/pc98/i386 | |
parent | 6d981da88aecfa97972620eeeeb16bb7028934d4 (diff) | |
download | FreeBSD-src-67efd9fff6e9ce1e90b2d527aacf42dd64ac2dbd.zip FreeBSD-src-67efd9fff6e9ce1e90b2d527aacf42dd64ac2dbd.tar.gz |
Synchronize with sys/i386/i386/userconfig.c revision 1.79 (cosmetic
change).
Diffstat (limited to 'sys/pc98/i386')
-rw-r--r-- | sys/pc98/i386/userconfig.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index 587b237..3b5805a 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.20 1996/12/18 20:52:31 kato Exp $ + ** $Id: userconfig.c,v 1.21 1996/12/18 20:54:22 kato Exp $ **/ /** @@ -573,6 +573,8 @@ findspot(DEV_LIST *dev, DEV_LIST *list) { if (ap->comment != DEV_DEVICE) /* ignore comments */ continue; + if (ap->iobase == -2) /* don't group with a PCI device */ + continue; if (!strcmp(dev->dev,ap->dev)) /* same base device */ { if ((dev->unit <= ap->unit) /* belongs before (equal is bad) */ @@ -2252,7 +2254,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.20 1996/12/18 20:52:31 kato Exp $ + * $Id: userconfig.c,v 1.21 1996/12/18 20:54:22 kato Exp $ */ #include "scbus.h" |