diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
| commit | 1b1ee5553889e207087539ddafa5dfd4e28bd585 (patch) | |
| tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /sys/i386/conf | |
| parent | b1a97daa1e06ab0de3071f979965878fd056292b (diff) | |
| download | FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.zip FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.tar.gz | |
Merge RELENG_2_0_5 into HEAD
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/GENERIC | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 675c405..3de583d 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -1,7 +1,7 @@ # # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks # -# $Id: GENERIC,v 1.44 1995/05/02 04:40:06 phk Exp $ +# $Id: GENERIC,v 1.45.2.3 1995/06/05 21:50:41 jkh Exp $ # machine "i386" @@ -88,12 +88,15 @@ device lpt0 at isa? port? tty irq 7 vector lptintr device lpt1 at isa? port? tty device lpt2 at isa? port? tty +# Order is important here due to intrusive probes, do *not* alphabetize +# this list of network interfaces until the probes have been fixed. +# Right now it appears that the ie0 must be probed before ep0. See +# revision 1.20 of this file. device de0 device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 vector edintr device ed1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector edintr -device eg0 at isa? port 0x310 net irq 5 vector egintr -device ep0 at isa? port 0x300 net irq 10 vector epintr device ie0 at isa? port 0x360 net irq 7 iomem 0xd0000 vector ieintr +device ep0 at isa? port 0x300 net irq 10 vector epintr device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr @@ -105,9 +108,8 @@ pseudo-device loop pseudo-device ether pseudo-device log pseudo-device sl 1 -pseudo-device ppp 1 +# ijppp uses tun instead of ppp device +#pseudo-device ppp 1 +pseudo-device tun 1 pseudo-device pty 16 -pseudo-device speaker pseudo-device gzip # Exec gzipped a.out's -pseudo-device vn -pseudo-device tun 1 |
