Could you "bk mv drivers/usb/hcd drivers/usb/host" and then apply this patch? That will let most 2.5 host controller driver patches apply directly to 2.4 ... helping both releases, since 2.5 has more fixes while 2.4 has more users. (And testers!)
I've got a few other 2.4 patches in the queue, including a small "resync with EHCI" patch that will assume that directory has been renamed.
- Dave
--- 1.58/drivers/usb/Config.in Sun Feb 16 06:50:23 2003
+++ edited/drivers/usb/Config.in Mon Mar 3 10:26:49 2003
@@ -17,7 +17,7 @@
fi
comment 'USB Host Controller Drivers'
- source drivers/usb/hcd/Config.in
+ source drivers/usb/host/Config.in
if [ "$CONFIG_USB_UHCI_ALT" != "y" ]; then
dep_tristate ' UHCI (Intel PIIX4, VIA, ...) support' CONFIG_USB_UHCI
$CONFIG_USB
fi
--- 1.50/drivers/usb/Makefile Sun Feb 16 06:50:23 2003
+++ edited/drivers/usb/Makefile Mon Mar 3 10:13:41 2003
@@ -53,7 +53,7 @@
# EHCI should initialize/link before the other HCDs
ifeq ($(CONFIG_USB_EHCI_HCD),y)
- obj-y += hcd/ehci-hcd.o
+ obj-y += host/ehci-hcd.o
endif
obj-$(CONFIG_USB_UHCI) += usb-uhci.o
@@ -63,7 +63,7 @@
ifneq ($(CONFIG_USB_EHCI_HCD),n)
usbcore-objs += hcd.o
endif
-subdir-$(CONFIG_USB_EHCI_HCD) += hcd
+subdir-$(CONFIG_USB_EHCI_HCD) += host
obj-$(CONFIG_USB_MOUSE) += usbmouse.o
obj-$(CONFIG_USB_HID) += hid.o
@@ -106,7 +106,7 @@
obj-$(CONFIG_USB_LCD) += usblcd.o
# Object files in subdirectories
-mod-subdirs := serial hcd
+mod-subdirs := serial host
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_STORAGE) += storage
