diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-02-25 23:16:48 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-02-25 23:16:48 +0000 |
| commit | fc0ce7fb547eb0cc8f06a5b2ac14a7f809574a5e (patch) | |
| tree | a5601bf8212385dc090ccf7a62b4b8fc8d3a51f4 /sys/arch/i386/conf | |
| parent | a95762f56878eb7bd172118a3f74af75204929a9 (diff) | |
- Add lii(4) commented out to the amd64 configs
- Comment out lii(4) in the i386 configs since it does not work yet
- Add et(4) to the i386 and amd64 RAMDISK_CD configs
ok deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index f962354d2cc..4ff07e85eef 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.602 2008/02/24 21:49:37 uwe Exp $ +# $OpenBSD: GENERIC,v 1.603 2008/02/25 23:16:47 brad Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -560,7 +560,7 @@ tht* at thtc? gem* at pci? # Sun 'gem' ethernet vic* at pci? # VMware VMXnet virtual interface et* at pci? # Agere/LSI ET1310 -lii* at pci? # Atheros L2 Ethernet +#lii* at pci? # Attansic L2 Ethernet # Wireless network cards acx* at pci? # TI ACX100/ACX111 (802.11b/g) diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 22e41ed41a7..d83ff61164c 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.148 2007/12/31 19:29:11 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.149 2008/02/25 23:16:47 brad Exp $ machine i386 # architecture, used by config; REQUIRED @@ -359,7 +359,8 @@ vge* at pci? # VIA VT612x nfe* at pci? # NVIDIA nForce Ethernet xge* at pci? # Neterion Xframe-I/II 10Gb ethernet vic* at pci? # VMware VMXnet virtual interface -lii* at pci? # Atheros L2 Ethernet +et* at pci? # Agere/LSI ET1310 +#lii* at pci? # Attansic L2 Ethernet # Wireless network cards ath* at pci? # Atheros AR5k (802.11a/b/g) @@ -400,6 +401,7 @@ xmphy* at mii? # XaQti XMAC-II PHYs bmtphy* at mii? # Broadcom 10/100 PHYs rgephy* at mii? # Realtek 8169S/8110S PHY ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY +etphy* at mii? # Agere/LSI ET1011 TruePHY ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback |