# 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.604.1.2 -> 1.604.1.3
# drivers/usb/host/Config.in 1.12 -> 1.13
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/04 [EMAIL PROTECTED] 1.604.1.3
# USB: picked a uhci driver to go forward with.
#
# Removed usb-uhci-hcd.o from the list of UHCI drivers.
# This allowed the logic to be cleaned up.
# Removed CONFIG_EXPERIMENTAL dependancy, as it's no longer needed.
# --------------------------------------------
#
diff -Nru a/drivers/usb/host/Config.in b/drivers/usb/host/Config.in
--- a/drivers/usb/host/Config.in Fri Jul 5 14:51:23 2002
+++ b/drivers/usb/host/Config.in Fri Jul 5 14:51:23 2002
@@ -2,23 +2,9 @@
# USB Host Controller Drivers
#
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
-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
-#if [ "$CONFIG_USB_UHCI" != "y" ]; then
-# dep_tristate ' UHCI Alternate Driver (JE) support' CONFIG_USB_UHCI_ALT
$CONFIG_USB
-#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 ' EHCI HCD (USB 2.0) support' CONFIG_USB_EHCI_HCD $CONFIG_USB
+dep_tristate ' OHCI HCD support' CONFIG_USB_OHCI_HCD $CONFIG_USB
+dep_tristate ' UHCI HCD (most Intel and VIA) support' CONFIG_USB_UHCI_HCD_ALT
+$CONFIG_USB
if [ "$CONFIG_ARM" = "y" ]; then
dep_tristate ' SA1111 OHCI-compatible host interface support'
CONFIG_USB_OHCI_SA1111 $CONFIG_USB
dep_tristate ' SL811HS support' CONFIG_USB_SL811HS $CONFIG_USB
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Bringing you mounds of caffeinated joy.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
