From f4f1e00d62c0972ff15b348c3acbdf93677e7d73 Mon Sep 17 00:00:00 2001
From: drochner <drochner@NetBSD.org>
Date: Tue, 11 Mar 2003 11:59:31 +0000
Subject: [PATCH] make a kernel with the combination ohci@cardbus + ehci@pci
 link

---
 sys/dev/cardbus/files.cardbus  |  6 +++---
 sys/dev/cardbus/ohci_cardbus.c | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index e4fc27756b06..d7c5061525c8 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-#	$NetBSD: files.cardbus,v 1.18 2001/11/28 10:21:21 lukem Exp $
+#	$NetBSD: files.cardbus,v 1.19 2003/03/11 11:59:31 drochner Exp $
 #
 # files.cardbus
 #
@@ -47,10 +47,10 @@ attach	ohci at cardbus with ohci_cardbus
 file	dev/cardbus/ohci_cardbus.c	ohci_cardbus
 
 #
-# OHCI USB controller
+# EHCI USB controller
 #
 attach	ehci at cardbus with ehci_cardbus
-file	dev/cardbus/ehci_cardbus.c	ehci_cardbus
+file	dev/cardbus/ehci_cardbus.c	ehci_cardbus needs-flag
 
 #
 # OHCI IEEE 1394 controller
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index c2de026f6eda..7d70a0b7174d 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci_cardbus.c,v 1.14 2002/10/02 16:33:43 thorpej Exp $	*/
+/*	$NetBSD: ohci_cardbus.c,v 1.15 2003/03/11 11:59:31 drochner Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,9 +45,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.14 2002/10/02 16:33:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.15 2003/03/11 11:59:31 drochner Exp $");
 
-#include "ehci.h"
+#include "ehci_cardbus.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,7 +80,7 @@ int	ohci_cardbus_detach(device_ptr_t, int);
 
 struct ohci_cardbus_softc {
 	ohci_softc_t		sc;
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
 	struct usb_cardbus	sc_cardbus;
 #endif
 	cardbus_chipset_tag_t	sc_cc;
@@ -187,7 +187,7 @@ XXX	(ct->ct_cf->cardbus_mem_open)(cc, 0, iob, iob + 0x40);
 		return;
 	}
 
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
 	usb_cardbus_add(&sc->sc_cardbus, ca, &sc->sc.sc_bus);
 #endif
 
@@ -215,7 +215,7 @@ ohci_cardbus_detach(device_ptr_t self, int flags)
 		    sc->sc.ioh, sc->sc.sc_size);
 		sc->sc.sc_size = 0;
 	}
-#if NEHCI > 0
+#if NEHCI_CARDBUS > 0
 	usb_cardbus_rem(&sc->sc_cardbus);
 #endif
 	return (0);