# 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.553 -> 1.554
# drivers/usb/host/Config.in 1.7 -> 1.8
# drivers/usb/host/Makefile 1.7 -> 1.8
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/05/17 [EMAIL PROTECTED] 1.554
# USB Config.in and Makefile fixups
#
# fixed up the Config.in and Makefile merge due to there being 2 uhci-hcd drivers
added at once.
# --------------------------------------------
#
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:17 2002
+++ b/drivers/usb/host/Config.in Fri May 17 15:16:17 2002
@@ -4,7 +4,8 @@
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 (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_ALT" != "y" ]; then
dep_tristate ' UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI $CONFIG_USB
fi
diff -Nru a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
--- a/drivers/usb/host/Makefile Fri May 17 15:16:17 2002
+++ b/drivers/usb/host/Makefile Fri May 17 15:16:17 2002
@@ -7,7 +7,8 @@
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
-obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
+obj-$(CONFIG_USB_UHCI_HCD) += usb-uhci-hcd.o
+obj-$(CONFIG_USB_UHCI_HCD_ALT) += uhci-hcd.o
obj-$(CONFIG_USB_UHCI) += usb-uhci.o
obj-$(CONFIG_USB_UHCI_ALT) += uhci.o
_______________________________________________________________
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
