# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.555 -> 1.556
# drivers/usb/host/Config.in 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/05/17 [EMAIL PROTECTED] 1.556
# [PATCH] USB - Host controller Config.in changes
#
# - Commented out the usb-ohci driver. This is part of the migration away from
# this driver, to the ohci-hcd driver.
# - Prevented the two UHCI_HCD drivers from both being compiled into the kernel
# at the same time.
# --------------------------------------------
#
diff -Nru a/drivers/usb/host/Config.in b/drivers/usb/host/Config.in
--- a/drivers/usb/host/Config.in Fri May 17 15:16:13 2002
+++ b/drivers/usb/host/Config.in Fri May 17 15:16:13 2002
@@ -4,8 +4,12 @@
comment 'USB Host Controller Drivers'
dep_tristate ' EHCI HCD (USB 2.0) support (EXPERIMENTAL)' CONFIG_USB_EHCI_HCD
$CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' OHCI HCD support (EXPERIMENTAL)' CONFIG_USB_OHCI_HCD $CONFIG_USB
$CONFIG_EXPERIMENTAL
-dep_tristate ' UHCI HCD (most Intel and VIA) support (EXPERIMENTAL)'
CONFIG_USB_UHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
-dep_tristate ' UHCI HCD Alternate (most Intel and VIA) support (EXPERIMENTAL)'
CONFIG_USB_UHCI_HCD_ALT $CONFIG_USB $CONFIG_EXPERIMENTAL
+if [ "$CONFIG_USB_UHCI_HCD_ALT" != "y" ]; then
+ dep_tristate ' UHCI HCD (most Intel and VIA) support (EXPERIMENTAL)'
+CONFIG_USB_UHCI_HCD $CONFIG_USB $CONFIG_EXPERIMENTAL
+fi
+if [ "$CONFIG_USB_UHCI_HCD" != "y" ]; then
+ dep_tristate ' UHCI HCD Alternate (most Intel and VIA) support (EXPERIMENTAL)'
+CONFIG_USB_UHCI_HCD_ALT $CONFIG_USB $CONFIG_EXPERIMENTAL
+fi
if [ "$CONFIG_USB_UHCI_ALT" != "y" ]; then
dep_tristate ' UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI $CONFIG_USB
fi
@@ -14,4 +18,4 @@
else
define_bool CONFIG_USB_UHCI_ALT n
fi
-dep_tristate ' OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support' CONFIG_USB_OHCI
$CONFIG_USB
+#dep_tristate ' OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support' CONFIG_USB_OHCI
+$CONFIG_USB
_______________________________________________________________
Hundreds of nodes, one monster rendering program.
Now that�s a super model! Visit http://clustering.foundries.sf.net/
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
