G'day all,
In an attempt to resolve a build problem with the new usb/hcd
architecture, I ended up getting a lot of help from Kai Germaschewski
over on the kbuild-devel mailing list. He pointed out that our
Makefile[s] leave a little to be desired, and offered some suggestions.
So I did some changes to the Makefiles and then fixed a few Config.in
and Configure.help things. A draft patch follows. This is against
2.4.5-ac14, plus one little fix for the new catc driver's Configure.help
entry, already sent to Alan, copy attached.
Now I could well have missed something important, so please review this.
I'll try to incorporate any fixes, and then submit it again.
Brad
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/Documentation/Configure.help
linux/Documentation/Configure.help
--- clean/linux-2.4.5-ac14/Documentation/Configure.help Sun Jun 17 03:57:55 2001+++
linux/Documentation/Configure.help Sun Jun 17 01:31:59 2001
@@ -11554,6 +11554,9 @@
Say Y here if you want to support HID devices (from the USB
specification standpoint) that aren't strictly user interface
devices, like monitor controls and Uninterruptable Power Supplies.
+ It is also used for "consumer keys" on multimedia keyboards and
+ USB speakers.
+
This module supports these devices separately using a separate
event interface on /dev/usb/hiddevX (char 180:96 to 180:111).
This driver requires CONFIG_USB_HID.
@@ -11688,9 +11691,19 @@
The module will be called scanner.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
+HP 5300C scanner support
+CONFIG_USB_HP5300
+ Say Y here if you want to connect a HP5300C scanner to your computer's
+ USB port.
+
+ This code is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called hp5300.o. If you want to compile it as
+ a module, say M here and read <file:Documentation/modules.txt>.
+
USB Audio support
CONFIG_USB_AUDIO
- Say Y here if you want to connect UAB audio equipment such as
+ Say Y here if you want to connect USB audio equipment such as
speakers to your computer's USB port.
This code is also available as a module ( = code which can be
@@ -12163,17 +12176,20 @@
USB device file system
CONFIG_USB_DEVICEFS
- If you say Y here (and to "/proc file system support" below), you
- will get a file /proc/bus/usb/devices which lists the devices
- currently connected to your USB busses, a file /proc/bus/usb/drivers
- which lists the USB kernel client drivers currently loaded, and for
- every connected device a file named "/proc/bus/usb/xxx/yyy", where
- xxx is the bus number and yyy the device number; the latter files
- can be used by user space programs to talk directly to the device.
- These files are "virtual", meaning they are generated on the fly
- and not stored on the hard drive.
+ If you say Y here (and to "/proc file system support" in the "File
+ systems section, above), you will get a file /proc/bus/usb/devices
+ which lists the devices currently connected to your USB bus or busses,
+ a file /proc/bus/usb/drivers which lists the USB kernel client drivers
+ currently loaded, and for every connected device a file named
+ "/proc/bus/usb/xxx/yyy", where xxx is the bus number and yyy the
+ device number; the latter files can be used by user space programs to
+ talk directly to the device. These files are "virtual", meaning they
+ are generated on the fly and not stored on the hard drive.
- For the format of the /proc/bus/usb/ files, please read
+ You may need to mount the usbdevfs filesystem to see the files, use
+ mount -t usbdevfs none /proc/bus/usb
+
+ For the format of the various /proc/bus/usb/ files, please read
<file:Documentation/usb/proc_usb_info.txt>.
Please note that this code is completely unrelated to devfs, the
@@ -12229,9 +12245,14 @@
Microtech CompactFlash/SmartMedia reader
CONFIG_USB_STORAGE_DPCM
- Say Y here to upport the Microtech ZiO! CompactFlash/SmartMedia reader,
+ Say Y here to support the Microtech ZiO! CompactFlash/SmartMedia reader,
details at <http://www.microtechint.com/zio/index.html>. This driver
treats the flash card as a removable storage device.
+
+Sandisk SDDR-09 SmartMedia reader support
+CONFIG_USB_STORAGE_SDDR09
+ Say Y here to include additional code to support the Sandisk SDDR-09
+ SmartMedia reader in the USB Mass Storage driver.
PLUSB Prolific USB-Network driver
CONFIG_USB_PLUSB
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/input/Config.in
linux/drivers/input/Config.in
--- clean/linux-2.4.5-ac14/drivers/input/Config.in Wed Aug 23 04:41:14 2000+++
linux/drivers/input/Config.in Sun Jun 17 03:28:55 2001
@@ -6,15 +6,13 @@
comment 'Input core support'
tristate 'Input core support' CONFIG_INPUT
-if [ "$CONFIG_INPUT" != "n" ]; then
- dep_tristate ' Keyboard support' CONFIG_INPUT_KEYBDEV $CONFIG_INPUT
- dep_tristate ' Mouse support' CONFIG_INPUT_MOUSEDEV $CONFIG_INPUT
- if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; then
- int ' Horizontal screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_X 1024
- int ' Vertical screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768
- fi
- dep_tristate ' Joystick support' CONFIG_INPUT_JOYDEV $CONFIG_INPUT
- dep_tristate ' Event interface support' CONFIG_INPUT_EVDEV $CONFIG_INPUT
+dep_tristate ' Keyboard support' CONFIG_INPUT_KEYBDEV $CONFIG_INPUT
+dep_tristate ' Mouse support' CONFIG_INPUT_MOUSEDEV $CONFIG_INPUT
+if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; then
+ int ' Horizontal screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_X 1024
+ int ' Vertical screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768
fi
+dep_tristate ' Joystick support' CONFIG_INPUT_JOYDEV $CONFIG_INPUT
+dep_tristate ' Event interface support' CONFIG_INPUT_EVDEV $CONFIG_INPUT
endmenu
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/usb/Config.in
linux/drivers/usb/Config.in
--- clean/linux-2.4.5-ac14/drivers/usb/Config.in Sat Jun 16 23:54:55 2001+++
linux/drivers/usb/Config.in Sun Jun 17 03:17:38 2001
@@ -7,8 +7,6 @@
dep_tristate 'Support for USB' CONFIG_USB $CONFIG_PCI
if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
bool ' USB verbose debug messages' CONFIG_USB_DEBUG
- bool ' Long timeout for slow-responding devices (some MGE Ellipse UPSes)'
CONFIG_USB_LONG_TIMEOUT
- bool ' Large report fetching for "broken" devices (some APC UPSes)'
CONFIG_USB_LARGE_CONFIG
comment 'Miscellaneous USB options'
bool ' Preliminary USB device filesystem' CONFIG_USB_DEVICEFS
@@ -17,73 +15,81 @@
else
define_bool CONFIG_USB_BANDWIDTH n
fi
+ bool ' Long timeout for slow-responding devices (some MGE Ellipse UPSes)'
+CONFIG_USB_LONG_TIMEOUT
+ bool ' Large report fetching for "broken" devices (some APC UPSes)'
+CONFIG_USB_LARGE_CONFIG
+fi
comment 'USB Controllers'
- 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
-
- comment 'USB Device Class drivers'
- dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
- dep_tristate ' USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH
$CONFIG_USB $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB
$CONFIG_SCSI
- if [ "$CONFIG_USB_STORAGE" != "n" ]; then
- bool ' USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG
- bool ' Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM
- bool ' Microtech CompactFlash/SmartMedia reader' CONFIG_USB_STORAGE_DPCM
- bool ' SanDisk SDDR-09 SmartMedia reader support' CONFIG_USB_STORAGE_SDDR09
- fi
- dep_tristate ' USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
- dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
+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
- comment 'USB Human Interface Devices (HID)'
- if [ "$CONFIG_INPUT" = "n" ]; then
- comment ' Input core support is needed for USB HID'
- else
- dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID
$CONFIG_USB $CONFIG_INPUT
- dep_mbool ' /dev/hiddev raw HID device support (EXPERIMENAL)'
CONFIG_USB_HIDDEV $CONFIG_USB_HID
- if [ "$CONFIG_USB_HID" != "y" ]; then
- dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD
$CONFIG_USB $CONFIG_INPUT
- dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE
$CONFIG_USB $CONFIG_INPUT
- fi
- dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM
$CONFIG_USB $CONFIG_INPUT
+comment 'USB Device Class drivers'
+dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
+dep_tristate ' USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH
+$CONFIG_USB $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
+ dep_mbool ' USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG
+$CONFIG_USB_STORAGE
+ dep_mbool ' Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM
+$CONFIG_USB_STORAGE
+ dep_mbool ' Microtech CompactFlash/SmartMedia reader' CONFIG_USB_STORAGE_DPCM
+$CONFIG_USB_STORAGE
+ dep_mbool ' SanDisk SDDR-09 SmartMedia reader support'
+CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE
+dep_tristate ' USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
+dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
+
+comment 'USB Human Interface Devices (HID)'
+if [ "$CONFIG_INPUT" = "n" ]; then
+ comment ' Input core support is needed for USB HID'
+else
+ dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID
+$CONFIG_USB $CONFIG_INPUT
+ dep_mbool ' /dev/hiddev raw HID device support (EXPERIMENTAL)'
+CONFIG_USB_HIDDEV $CONFIG_USB_HID
+ if [ "$CONFIG_USB_HID" != "y" ]; then
+ dep_tristate ' USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB
+$CONFIG_INPUT
+ dep_tristate ' USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB
+$CONFIG_INPUT
fi
+ dep_tristate ' Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB
+$CONFIG_INPUT
+fi
- comment 'USB Imaging devices'
- dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB
- dep_tristate ' USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)'
CONFIG_USB_MDC800 $CONFIG_USB $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Scanner support' CONFIG_USB_SCANNER $CONFIG_USB
- dep_tristate ' Microtek X6USB scanner support (EXPERIMENTAL)' CONFIG_USB_MICROTEK
$CONFIG_USB $CONFIG_SCSI $CONFIG_EXPERIMENTAL
- dep_tristate ' HP 5300 C scanner support (EXPERIMENTAL)' CONFIG_USB_HP5300
$CONFIG_USB $CONFIG_SCSI $CONFIG_EXPERIMENTAL
-
- comment 'USB Multimedia devices'
+comment 'USB Imaging devices'
+dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB
+dep_tristate ' USB Mustek MDC800 Digital Camera support (EXPERIMENTAL)'
+CONFIG_USB_MDC800 $CONFIG_USB $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Scanner support' CONFIG_USB_SCANNER $CONFIG_USB
+dep_tristate ' Microtek X6USB scanner support (EXPERIMENTAL)' CONFIG_USB_MICROTEK
+$CONFIG_USB $CONFIG_SCSI $CONFIG_EXPERIMENTAL
+dep_tristate ' HP 5300 C scanner support (EXPERIMENTAL)' CONFIG_USB_HP5300
+$CONFIG_USB $CONFIG_SCSI $CONFIG_EXPERIMENTAL
+
+comment 'USB Multimedia devices'
+if [ "$CONFIG_VIDEO_DEV" = "n" ]; then
+ comment ' Video4Linux support is needed for USB Multimedia device support'
+else
dep_tristate ' USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM
$CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB
$CONFIG_VIDEO_DEV
dep_tristate ' USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
dep_tristate ' USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB
$CONFIG_VIDEO_DEV
dep_tristate ' D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR
$CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
- dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
+fi
+dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
- comment 'USB Network adaptors'
+comment 'USB Network adaptors'
+if [ "$CONFIG_NET" = "n" ]; then
+ comment ' Networking support is needed for USB Networking device support'
+else
dep_tristate ' PLUSB Prolific USB-Network driver (EXPERIMENTAL)' CONFIG_USB_PLUSB
$CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB ADMtek Pegasus-based ethernet device support (EXPERIMENTAL)'
CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)'
CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
- dep_tristate ' USB CATC NetMate-based Ethernet driver (EXPERIMENTAL)'
CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+ dep_tristate ' USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)'
+CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
dep_tristate ' USB Communication Class Ethernet driver (EXPERIMENTAL)'
CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
- dep_tristate ' USB-to-USB Networking (NetChip, Prolific, ...) (EXPERIMENTAL)'
CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+ dep_tristate ' USB-to-USB Networking cable device support (EXPERIMENTAL)'
+CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+fi
- comment 'USB port drivers'
- dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB
$CONFIG_PARPORT
- source drivers/usb/serial/Config.in
+comment 'USB port drivers'
+dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
+source drivers/usb/serial/Config.in
- comment 'USB misc drivers'
- dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500
$CONFIG_USB $CONFIG_EXPERIMENTAL
-fi
+comment 'Miscellaneous USB drivers'
+dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500
+$CONFIG_USB $CONFIG_EXPERIMENTAL
endmenu
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/usb/Makefile
linux/drivers/usb/Makefile
--- clean/linux-2.4.5-ac14/drivers/usb/Makefile Sat Jun 16 23:54:55 2001
+++ linux/drivers/usb/Makefile Sun Jun 17 00:20:25 2001
@@ -2,46 +2,33 @@
# Makefile for the kernel USB device drivers.
#
-# Subdirs.
-
# The target object and module list name.
O_TARGET := usbdrv.o
+# Subdirs, required for future hcd refactoring.
+
+#mod-subdirs := hcd
+#subdir-y := hcd
+
# Objects that export symbols.
-export-objs := usb.o
+export-objs := usb.o pwc-uncompress.o
-# Multipart objects.
+# Multipart builds, only invoked if needed
-list-multi := usbcore.o hid.o
-usbcore-objs := usb.o usb-debug.o hub.o
-hid-objs := hid-core.o hid-input.o
-
-ifneq ($(CONFIG_USB_PWC),n)
- export-objs += pwc-uncompress.o
- list-multi += pwc.o
-endif
+list-multi := usbcore.o hid.o pwc.o
-pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
+usbcore-objs := usb.o usb-debug.o hub.o
+usbcore-objs-$(CONFIG_USB_DEVICEFS) += devio.o inode.o drivers.o devices.o
+usbcore-objs += $(usbcore-objs-y)
+hid-objs := hid-core.o hid-input.o
+hid-objs-$(CONFIG_USB_HIDDEV) += hiddev.o
+hid-objs += $(hid-objs-y)
-# Optional parts of multipart objects.
+pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
-ifeq ($(CONFIG_USB_DEVICEFS),y)
- usbcore-objs += devio.o inode.o drivers.o devices.o
-endif
-
-ifeq ($(CONFIG_USB_HIDDEV),y)
- hid-objs += hiddev.o
-endif
-
-# Object file lists.
-
-obj-y :=
-obj-m :=
-obj-n :=
-obj- :=
# Each configuration option enables a list of files.
@@ -87,13 +74,7 @@
subdir-$(CONFIG_USB_SERIAL) += serial
subdir-$(CONFIG_USB_STORAGE) += storage
-ifeq ($(CONFIG_USB_SERIAL),y)
- obj-y += serial/usb-serial.o
-endif
-
-ifeq ($(CONFIG_USB_STORAGE),y)
- obj-y += storage/storage.o
-endif
+obj-y += $(addsuffix /vmlinux-obj.o, $(subdir-y))
include $(TOPDIR)/Rules.make
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/usb/serial/Config.in
linux/drivers/usb/serial/Config.in
--- clean/linux-2.4.5-ac14/drivers/usb/serial/Config.in Fri Jun 15 09:19:31 2001+++
linux/drivers/usb/serial/Config.in Sun Jun 17 03:24:23 2001
@@ -5,31 +5,25 @@
comment 'USB Serial Converter support'
dep_tristate 'USB Serial Converter support' CONFIG_USB_SERIAL $CONFIG_USB
-if [ "$CONFIG_USB_SERIAL" != "n" ]; then
- if [ "$CONFIG_USB_SERIAL" = "y" ]; then
- bool ' USB Serial Converter verbose debug' CONFIG_USB_SERIAL_DEBUG
- fi
- bool ' USB Generic Serial Driver' CONFIG_USB_SERIAL_GENERIC
- dep_tristate ' USB Belkin and Peracom Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_BELKIN $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB ConnectTech WhiteHEAT Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_WHITEHEAT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Digi International AccelePort USB Serial Driver'
CONFIG_USB_SERIAL_DIGI_ACCELEPORT $CONFIG_USB_SERIAL
- dep_tristate ' USB Empeg empeg-car Mark I/II Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_EMPEG $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB FTDI Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_FTDI_SIO $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Handspring Visor Driver' CONFIG_USB_SERIAL_VISOR
$CONFIG_USB_SERIAL
- dep_tristate ' USB Inside Out Edgeport Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_EDGEPORT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Keyspan PDA Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_KEYSPAN_PDA $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Keyspan USA-xxx Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_KEYSPAN $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- if [ "$CONFIG_USB_SERIAL_KEYSPAN" != "n" ]; then
- bool ' USB Keyspan USA-28 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28
- bool ' USB Keyspan USA-28X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28X
- bool ' USB Keyspan USA-19 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19
- bool ' USB Keyspan USA-18X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA18X
- bool ' USB Keyspan USA-19W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19W
- bool ' USB Keyspan USA-49W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49W
- fi
- dep_tristate ' USB MCT Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_MCT_U232 $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB Prolific 2303 Single Port Serial Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_PL2303 $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
- dep_tristate ' USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)'
CONFIG_USB_SERIAL_OMNINET $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
-fi
+dep_mbool ' USB Serial Converter verbose debug' CONFIG_USB_SERIAL_DEBUG
+$CONFIG_USB_SERIAL
+dep_mbool ' USB Generic Serial Driver' CONFIG_USB_SERIAL_GENERIC $CONFIG_USB_SERIAL
+dep_tristate ' USB Belkin and Peracom Single Port Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_BELKIN $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB ConnectTech WhiteHEAT Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_WHITEHEAT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Digi International AccelePort USB Serial Driver'
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT $CONFIG_USB_SERIAL
+dep_tristate ' USB Empeg empeg-car Mark I/II Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_EMPEG $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB FTDI Single Port Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_FTDI_SIO $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Handspring Visor Driver' CONFIG_USB_SERIAL_VISOR
+$CONFIG_USB_SERIAL
+dep_tristate ' USB Inside Out Edgeport Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_EDGEPORT $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Keyspan PDA Single Port Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_KEYSPAN_PDA $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Keyspan USA-xxx Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_KEYSPAN $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_mbool ' USB Keyspan USA-28 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_mbool ' USB Keyspan USA-28X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA28X
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_mbool ' USB Keyspan USA-19 Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_mbool ' USB Keyspan USA-18X Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA18X
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_mbool ' USB Keyspan USA-19W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA19W
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_mbool ' USB Keyspan USA-49W Firmware' CONFIG_USB_SERIAL_KEYSPAN_USA49W
+$CONFIG_USB_SERIAL_KEYSPAN
+dep_tristate ' USB MCT Single Port Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_MCT_U232 $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB Prolific 2303 Single Port Serial Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_PL2303 $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
+dep_tristate ' USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)'
+CONFIG_USB_SERIAL_OMNINET $CONFIG_USB_SERIAL $CONFIG_EXPERIMENTAL
endmenu
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/usb/serial/Makefile
linux/drivers/usb/serial/Makefile
--- clean/linux-2.4.5-ac14/drivers/usb/serial/Makefile Fri Jun 15 09:19:31 2001+++
linux/drivers/usb/serial/Makefile Sun Jun 17 01:52:49 2001
@@ -2,7 +2,7 @@
# Makefile for the USB serial device drivers.
#
-O_TARGET := usb-serial.o
+O_TARGET := vmlinux-obj.o
# Object file lists.
diff -Naur -X dontdiff clean/linux-2.4.5-ac14/drivers/usb/storage/Makefile
linux/drivers/usb/storage/Makefile
--- clean/linux-2.4.5-ac14/drivers/usb/storage/Makefile Sat Dec 30 09:07:23 2000+++
linux/drivers/usb/storage/Makefile Sun Jun 17 01:53:13 2001
@@ -5,7 +5,7 @@
# Rewritten to use lists instead of if-statements.
#
-O_TARGET := storage.o
+O_TARGET := vmlinux-obj.o
EXTRA_CFLAGS := -I../../scsi/
list-multi := usb-storage.o
catc-confhelp.patch
