Add more cardbus USB controllers.

This commit is contained in:
augustss 2006-01-29 11:32:01 +00:00
parent 8ce024013a
commit 42d1b78d2c
2 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.718 2006/01/05 10:24:11 xtraeme Exp $
# $NetBSD: GENERIC,v 1.719 2006/01/29 11:32:01 augustss Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.718 $"
#ident "GENERIC-$Revision: 1.719 $"
maxusers 32 # estimated number of users
@ -935,6 +935,7 @@ uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# CardBus USB controllers
#ehci* at cardbus? function ? # Enhanced Host Controller
#ohci* at cardbus? function ? # Open Host Controller
#uhci* at cardbus? function ? # Universal Host Controller (Intel)
# ISA USB controllers
#slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.166 2006/01/12 11:45:25 tron Exp $
# $NetBSD: GENERIC_LAPTOP,v 1.167 2006/01/29 11:32:01 augustss 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.166 $"
#ident "GENERIC-$Revision: 1.167 $"
maxusers 32 # estimated number of users
@ -644,7 +644,9 @@ ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# CardBus USB controllers
#ohci* at cardbus? function ? # Open Host Controller
ehci* at cardbus? function ? # Enhanced Host Controller
ohci* at cardbus? function ? # Open Host Controller
uhci* at cardbus? function ? # Universal Host Controller (Intel)
# USB bus support
usb* at ehci?