Please merge.
- Dave
Kernel config and build updates to match the preceding patches: CONFIG_USB_ETH_RNDIS option for USB_ETH, and links epautoconf to the drivers using that library code.
--- 1.4/drivers/usb/gadget/Config.in Fri Mar 12 03:15:21 2004 +++ edited/drivers/usb/gadget/Config.in Mon Jun 21 08:29:31 2004 @@ -53,6 +53,9 @@ dep_tristate ' Gadget Zero (DEVELOPMENT)' CONFIG_USB_ZERO $CONFIG_USB_GADGET_CONTROLLER dep_tristate ' Ethernet Gadget (EXPERIMENTAL)' CONFIG_USB_ETH $CONFIG_USB_GADGET_CONTROLLER $CONFIG_NET + if [ "$CONFIG_USB_ETH" = "y" -o "$CONFIG_USB_ETH" = "m" ] ; then + bool ' RNDIS support (EXPERIMENTAL)' CONFIG_USB_ETH_RNDIS + fi dep_tristate ' File-backed Storage Gadget (DEVELOPMENT)' CONFIG_USB_FILE_STORAGE $CONFIG_USB_GADGET_CONTROLLER dep_mbool ' File-backed Storage Gadget test mode' CONFIG_USB_FILE_STORAGE_TEST $CONFIG_USB_FILE_STORAGE --- 1.4/drivers/usb/gadget/Makefile Fri Mar 12 03:35:25 2004 +++ edited/drivers/usb/gadget/Makefile Mon Jun 21 08:32:36 2004 @@ -16,13 +16,14 @@ controller-$(CONFIG_USB_GOKU) += goku_udc.o # ... and only one of these, too; kbuild/kconfig don't help though. -g_zero-objs := zero.o usbstring.o config.o +g_zero-objs := zero.o usbstring.o config.o epautoconf.o obj-$(CONFIG_USB_ZERO) += g_zero.o -g_ether-objs := ether.o usbstring.o config.o +g_ether-objs := ether.o usbstring.o config.o epautoconf.o obj-$(CONFIG_USB_ETH) += g_ether.o -g_file_storage-objs := file_storage.o usbstring.o +g_file_storage-objs := file_storage.o usbstring.o config.o \ + epautoconf.o obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o export-objs := $(controller-y) $(controller-m)
