From owner-svn-src-all@FreeBSD.ORG  Thu Aug 13 08:18:30 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E462106566B;
	Thu, 13 Aug 2009 08:18:30 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 234098FC41;
	Thu, 13 Aug 2009 08:18:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7D8ITiR093435;
	Thu, 13 Aug 2009 08:18:30 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7D8ITDx093434;
	Thu, 13 Aug 2009 08:18:29 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <200908130818.n7D8ITDx093434@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 13 Aug 2009 08:18:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196168 - in stable/7/sys/modules: . ohci uhci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2009 08:18:30 -0000

Author: n_hibma
Date: Thu Aug 13 08:18:29 2009
New Revision: 196168
URL: http://svn.freebsd.org/changeset/base/196168

Log:
  Add these two modules to enable loading of 'the other' host controller
  if only one was compiled into the kernel.
  
  This happens on a laptop with an Intel chipset (UHCI) to which an Option
  3G Cardbus card is added (which contains a NEC USB host controller
  (OHCI)).

Added:
  stable/7/sys/modules/ohci/
  stable/7/sys/modules/ohci/Makefile   (contents, props changed)
  stable/7/sys/modules/uhci/
  stable/7/sys/modules/uhci/Makefile   (contents, props changed)
Modified:
  stable/7/sys/modules/Makefile

Modified: stable/7/sys/modules/Makefile
==============================================================================
--- stable/7/sys/modules/Makefile	Thu Aug 13 07:21:24 2009	(r196167)
+++ stable/7/sys/modules/Makefile	Thu Aug 13 08:18:29 2009	(r196168)
@@ -206,6 +206,7 @@ SUBDIR=	${_3dfx} \
 	${_nve} \
 	${_nvram} \
 	${_nwfs} \
+	ohci \
 	${_oltr} \
 	${_opensolaris} \
 	${_padlock} \
@@ -293,6 +294,7 @@ SUBDIR=	${_3dfx} \
 	ufoma \
 	uftdi \
 	ugen \
+	uhci \
 	uhid \
 	ukbd \
 	ulpt \

Added: stable/7/sys/modules/ohci/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/modules/ohci/Makefile	Thu Aug 13 08:18:29 2009	(r196168)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+S=	${.CURDIR}/../..
+
+.PATH: $S/dev/usb $S/pci
+
+KMOD=	ohci
+SRCS=	bus_if.h device_if.h usb_if.h usb_if.c opt_usb.h
+SRCS+=	ohci_pci.c ohci.c ohcireg.h ohcivar.h
+SRCS+=	opt_bus.h pci_if.h
+
+.include <bsd.kmod.mk>

Added: stable/7/sys/modules/uhci/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/modules/uhci/Makefile	Thu Aug 13 08:18:29 2009	(r196168)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+S=	${.CURDIR}/../..
+
+.PATH: $S/dev/usb $S/pci
+
+KMOD=	uhci
+SRCS=	bus_if.h device_if.h usb_if.h usb_if.c opt_usb.h
+SRCS+=	uhci_pci.c uhci.c uhcireg.h uhcivar.h
+SRCS+=	opt_bus.h pci_if.h
+
+.include <bsd.kmod.mk>