summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>1999-08-14 17:29:24 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>1999-08-14 17:29:24 +0000
commita502ba09ec3c7d62846e189bb5e6eb7f5a1a6903 (patch)
tree3c59e6eb9e8fd71fd13e047f18847fe3df2be7e3 /sys/arch/i386
parenta1075e6fff0ee8f214489e3ab9519114ce060e64 (diff)
Driver for ASIX88140A/88141 Ethernet; from FreeBSD
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/conf/GENERIC21
1 files changed, 11 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 726fc259612..38515e9d74b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.123 1999/08/13 05:45:16 fgsch Exp $
+# $OpenBSD: GENERIC,v 1.124 1999/08/14 17:29:23 aaron Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -47,7 +47,7 @@ pci* at mainbus0 bus ?
option PCIVERBOSE
option EISAVERBOSE
#option PCMCIAVERBOSE
-#option USBVERBOSE
+option USBVERBOSE
pchb* at pci? dev ? function ? # PCI-Host bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
@@ -63,22 +63,22 @@ pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
pcmcia* at pcic? controller ? socket ?
# PCI USB Controllers
-#uhci* at pci? # Universal Host Controller (Intel)
-#ohci* at pci? # Open Host Controller
+uhci* at pci? # Universal Host Controller (Intel)
+ohci* at pci? # Open Host Controller
# USB bus support
-#usb* at uhci?
-#usb* at ohci?
+usb* at uhci?
+usb* at ohci?
# USB Hubs
-#uhub* at usb?
-#uhub* at uhub? port ? configuration ? interface ?
+uhub* at usb?
+uhub* at uhub? port ? configuration ? interface ?
# USB Generic HID devices
-#uhid* at uhub? port ? configuration ? interface ?
+uhid* at uhub? port ? configuration ? interface ?
# USB Generic driver
-#ugen* at uhub? port ? configuration ? interface ?
+ugen* at uhub? port ? configuration ? interface ?
npx0 at isa? port 0xf0 irq 13 # math coprocessor
isadma0 at isa?
@@ -232,6 +232,7 @@ vr* at pci? dev ? function ? # VIA Rhine ethernet
pn* at pci? dev ? function ? # Lite-On PNIC ethernet
wb* at pci? dev ? function ? # Winbond W89C840F ethernet
ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet
+ax* at pci? dev ? function ? # ASIX AX88140A ethernet
# Media Independent Interface (mii) drivers
#exphy* at mii? phy ? # 3Com internal PHYs