From: kettenis <kettenis@openbsd.org>
Date: Fri, 18 Jul 2008 22:27:50 +0000 (+0000)
Subject: Add ohci(4) and ehci(4) at cardbus(4).
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6ac186ccd8a820c663e1f5ae3168cc74deb191ba;p=openbsd

Add ohci(4) and ehci(4) at cardbus(4).
---

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index f8a8b003eb8..72861236ed7 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.216 2008/07/11 14:23:53 kettenis Exp $
+#	$OpenBSD: GENERIC,v 1.217 2008/07/18 22:27:50 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -95,6 +95,8 @@ pgt*	at pci?			# Prism54 (only full-mac varients)
 acx*	at pci?			# TI ACX100/ACX111 (802.11b/g)
 ral*	at pci?			# Ralink RT2500/RT2501/RT2600
 ral*	at cardbus?		# Ralink RT2500/RT2501/RT2600
+malo*	at pci?			# Marvell Libertas
+malo*	at cardbus?		# Marvell Libertas
 malo*	at pcmcia?		# Marvell 88W8385
 
 # PCI SCSI
@@ -154,10 +156,12 @@ midi*	at autri?
 midi*	at opl?
 midi*	at eap?
 
-# PCI USB Controllers
+# USB Controllers
 ohci*	at pci?			# Open Host Controller
+ohci*	at cardbus?
 uhci*	at pci?			# Universal Host Controller (Intel)
 ehci*	at pci?			# Enhanced Host Controller
+ehci*	at cardbus?
 
 # USB bus support
 usb*	at ohci?