diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2007-11-17 23:44:25 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2007-11-17 23:44:25 +0000 |
| commit | b62bb5130b85d93fd980f3719cb85d547bcbde36 (patch) | |
| tree | d4ba976a7137f0f4dbd670bb68ea4c4a359d8f11 /sys | |
| parent | 9620add1354a0464ea4af99cc9e4a2a6cbfd4056 (diff) | |
- move the re/bwi CardBus entries in the GENERIC kernel config into
the CardBus section.
- add forgotten re CardBus entry to the RAMDISK kernel config.
ok dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index f1666a0a2cb..ab581e53d95 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.176 2007/11/10 13:13:42 mbalmer Exp $g +# $OpenBSD: GENERIC,v 1.177 2007/11/17 23:44:24 brad Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -81,7 +81,6 @@ epic* at pci? # SMC EPIC/100 ethernet bge* at pci? # Broadcom BCM570x (aka Tigon3) ti* at pci? # Alteon Tigon 1Gb ethernet re* at pci? # Realtek 8169/8169S/8110S -re* at cardbus? # Realtek 8169/8169S/8110S stge* at pci? # Sundance TC9021 GigE skc* at pci? # SysKonnect GEnesis 984x sk* at skc? # each port of above @@ -90,7 +89,6 @@ msk* at mskc? # each port of above an* at pci? # Cisco/Aironet atw* at pci? # ADMtek ADM8211 (802.11) bwi* at pci? # Broadcom AirForce (802.11b/g) -bwi* at cardbus? # Broadcom AirForce (802.11b/g) wi* at pci? # WaveLAN IEEE 802.11DS ral* at pci? # Ralink RT2500/RT2501/RT2600 rtw* at pci? # Realtek 8180 @@ -327,12 +325,14 @@ dc* at cardbus? # 21143, "tulip" clone ethernet fxp* at cardbus? # Intel PRO/100 ethernet xl* at cardbus? # 3C575/3C656 ethernet rl* at cardbus? # RealTek 81[23]9 ethernet +re* at cardbus? # Realtek 8169/8169S/8110S rtw* at cardbus? # Realtek 8180 wdc* at pcmcia? com* at pcmcia? com* at cardbus? malo* at cardbus? # Marvell Libertas acx* at cardbus? # TI ACX100/ACX111 (802.11b/g) +bwi* at cardbus? # Broadcom AirForce (802.11b/g) wsdisplay* at vgafb? diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 2c7c771c978..cc678fbaf0b 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.75 2007/05/28 13:13:54 martin Exp $ +# $OpenBSD: RAMDISK,v 1.76 2007/11/17 23:44:24 brad Exp $ # # PPC GENERIC config file # @@ -209,6 +209,7 @@ dc* at cardbus? # 21143, "tulip" clone ethernet fxp* at cardbus? # Intel PRO/100 ethernet xl* at cardbus? # 3C575/3C656 ethernet rl* at cardbus? # RealTek 81[23]9 ethernet +re* at cardbus? # Realtek 8169/8169S/8110S wdc* at pcmcia? wsdisplay* at vgafb? |