diff options
| author | jonathan <jonathan@NetBSD.org> | 2005-01-29 21:59:53 +0000 |
|---|---|---|
| committer | jonathan <jonathan@NetBSD.org> | 2005-01-29 21:59:53 +0000 |
| commit | 0e8a3d7d0d994ca2fa8719652c54959c4eae3248 (patch) | |
| tree | c710eb7c07ed274175f97e1c1d47f3961ca32e7b | |
| parent | 8633e293d560303f3c09d33498d57d453e7ef2fc (diff) | |
Now that we've switched to the split re(4) for PCI, add the cardbus
frontend for the split re(4) to files.cardbus, and to the generic x86
laptop config (sys/i386/conf/GENERIC_LAPTOP).
NB: as best I know, there are still unresolved issues in attach and
powersave, with the NetGear cardbus cards and re(4).
| -rw-r--r-- | sys/arch/i386/conf/GENERIC_LAPTOP | 6 | ||||
| -rw-r--r-- | sys/dev/cardbus/files.cardbus | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index caae9094052..7d705d1ab1c 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.129 2005/01/18 10:28:00 scw Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.130 2005/01/29 21:59:53 jonathan Exp $ # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled @@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.129 $" +#ident "GENERIC-$Revision: 1.130 $" maxusers 32 # estimated number of users @@ -589,6 +589,7 @@ ath* at cardbus? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at cardbus? dev ? function ? # ADMtek ADM8211 (802.11) ex* at cardbus? dev ? function ? # 3Com 3C575TX fxp* at cardbus? dev ? function ? # Intel i8255x +re* at cardbus? dev ? function ? # Realtek 8139C+/8169/8169S/8110S rtk* at cardbus? dev ? function ? # Realtek 8129/8139 tlp* at cardbus? dev ? function ? # DECchip 21143 @@ -605,6 +606,7 @@ makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs nsphy* at mii? phy ? # NS83840 PHYs nsphyter* at mii? phy ? # NS83843 PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs +rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs tlphy* at mii? phy ? # ThunderLAN PHYs tqphy* at mii? phy ? # TDK Semiconductor PHYs diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus index cce06086d8c..dbbb1888f69 100644 --- a/sys/dev/cardbus/files.cardbus +++ b/sys/dev/cardbus/files.cardbus @@ -1,4 +1,4 @@ -# $NetBSD: files.cardbus,v 1.25 2005/01/21 12:32:18 yamt Exp $ +# $NetBSD: files.cardbus,v 1.26 2005/01/29 21:59:53 jonathan Exp $ # # files.cardbus # @@ -89,6 +89,13 @@ attach rtk at cardbus with rtk_cardbus file dev/cardbus/if_rtk_cardbus.c rtk_cardbus # +# Realtek 8169 +# +attach re at cardbus with re_cardbus +file dev/cardbus/if_re_cardbus.c re_cardbus + + +# # Advansys SCSI controller. # attach adv at cardbus with adv_cardbus |
