summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Reindl <martin@cvs.openbsd.org>2007-06-22 10:55:29 +0000
committerMartin Reindl <martin@cvs.openbsd.org>2007-06-22 10:55:29 +0000
commit30ed18c263cb54e972c8e1f8f07c4efa5333aa79 (patch)
tree95ab9f1a00b6a7b7a22632f1c87b33e45d5759d2
parente7da94cecfb4d581fe4e671ed817a7443eb19605 (diff)
PCI malo(4) works
from Janjaap van Velthooven
-rw-r--r--distrib/notes/alpha/hardware5
-rw-r--r--sys/arch/alpha/conf/GENERIC3
2 files changed, 6 insertions, 2 deletions
diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware
index 4332dbae28d..40d3fe0aa64 100644
--- a/distrib/notes/alpha/hardware
+++ b/distrib/notes/alpha/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.88 2007/05/28 21:22:55 cnst Exp $
+dnl $OpenBSD: hardware,v 1.89 2007/06/22 10:55:28 martin Exp $
OpenBSD/MACHINE OSREV is expected to run on the following hardware.
If you have hardware that is listed here and are unable to run
OpenBSD, or if you are able to run OpenBSD on hardware not listed
@@ -615,6 +615,9 @@ work. It's our best guess that they do, but any feedback is appreciated.
PLANEX GW-DS54G
SMC EZ Connect g 2.4GHz SMC2802W
SMC 2802Wv2
+ Marvell Libertas based PCI IEEE 802.11b/g adapters [-]
+ Netgear WG311v3
+ Tenda TWL542P
Ralink RT2500 based PCI IEEE 802.11b/g adapters [*]
A-Link WL54H
Amigo AWI-926W
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index bd6f66a428e..869f610cd8c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.193 2007/05/31 23:18:25 uwe Exp $
+# $OpenBSD: GENERIC,v 1.194 2007/06/22 10:55:28 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -257,6 +257,7 @@ pgt* at pci? # Prism54 (only full-mac varients)
ral* at pci? # Ralink RT2500/RT2501/RT2600
#rtw* at pci? # Realtek 8180
wi* at pci? # WaveLAN IEEE 802.11DS
+malo* at pci? # Marvell Libertas
vga* at pci? # PCI VGA graphics
tga* at pci? # DEC ZLXp-E[123] graphics