Messages in this thread Patch in this message | | | Date | Thu, 11 Nov 1999 07:21:27 +0100 (CET) | From | Niels Kristian Bech Jensen <> | Subject | [PATCH] Update for drivers/usb/Config.in in 2.3.x kernel series. |
| |
CONFIG_USB is declared EXPERIMENTAL in the 2.3.x kernel series, but it does not depend on CONFIG_EXPERIMENTAL=y as does other EXPERIMENTAL options in the kernel tree.
This patch fixes that, makes the indentation follow Documentation/CodingStyle and updates arch/<xxx>/defconfig accordingly.
diff -u --recursive --new-file pre-patch-2.3.27-6/arch/i386/defconfig linux/arch/i386/defconfig --- pre-patch-2.3.27-6/arch/i386/defconfig Sun Nov 7 07:00:46 1999 +++ linux/arch/i386/defconfig Thu Nov 11 07:06:29 1999 @@ -368,11 +368,6 @@ # CONFIG_FTAPE is not set # -# USB drivers - not for the faint of heart -# -# CONFIG_USB is not set - -# # Misc devices # CONFIG_ACPI=y diff -u --recursive --new-file pre-patch-2.3.27-6/arch/mips/defconfig linux/arch/mips/defconfig --- pre-patch-2.3.27-6/arch/mips/defconfig Sun Nov 7 07:00:48 1999 +++ linux/arch/mips/defconfig Thu Nov 11 07:06:29 1999 @@ -290,11 +290,6 @@ # CONFIG_FTAPE is not set # -# USB drivers - not for the faint of heart -# -# CONFIG_USB is not set - -# # Filesystems # CONFIG_QUOTA=y diff -u --recursive --new-file pre-patch-2.3.27-6/drivers/usb/Config.in linux/drivers/usb/Config.in --- pre-patch-2.3.27-6/drivers/usb/Config.in Sun Nov 7 07:01:00 1999 +++ linux/drivers/usb/Config.in Thu Nov 11 07:06:29 1999 @@ -5,49 +5,48 @@ # Right now hubs, mice and keyboards work - at least with UHCI. # But that may be more a lucky coincidence than anything else.. # -mainmenu_option next_comment -comment 'USB drivers - not for the faint of heart' -tristate 'Support for USB (EXPERIMENTAL!)' CONFIG_USB -if [ ! "$CONFIG_USB" = "n" ]; then -comment 'USB Controllers' - dep_tristate ' UHCI (Intel PIIX4 and others) support' CONFIG_USB_UHCI \ - $CONFIG_USB - dep_tristate ' OHCI (Compaq and some others) support' CONFIG_USB_OHCI \ - $CONFIG_USB +if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + mainmenu_option next_comment + comment 'USB drivers - not for the faint of heart' + tristate 'Support for USB (EXPERIMENTAL)' CONFIG_USB + if [ ! "$CONFIG_USB" = "n" ]; then + comment 'USB Controllers' + dep_tristate ' UHCI (Intel PIIX4 and others) support' CONFIG_USB_UHCI $CONFIG_USB + dep_tristate ' OHCI (Compaq and some others) support' CONFIG_USB_OHCI $CONFIG_USB - if [ "$CONFIG_USB_OHCI" != "n" ]; then + if [ "$CONFIG_USB_OHCI" != "n" ]; then bool ' Enable tons of OHCI debugging output' CONFIG_USB_OHCI_DEBUG - fi - dep_tristate ' OHCI-HCD (other OHCI opt. Virt. Root Hub) support' \ - CONFIG_USB_OHCI_HCD $CONFIG_USB - if [ "$CONFIG_USB_OHCI_HCD" != "n" ]; then + fi + dep_tristate ' OHCI-HCD (other OHCI opt. Virt. Root Hub) support' CONFIG_USB_OHCI_HCD $CONFIG_USB + if [ "$CONFIG_USB_OHCI_HCD" != "n" ]; then bool ' OHCI-HCD Virtual Root Hub' CONFIG_USB_OHCI_VROOTHUB - fi + fi -comment 'Miscellaneous USB options' - bool ' Enable lots of ISOC debugging output' CONFIG_USB_DEBUG_ISOC - if [ "$CONFIG_PROC_FS" != "n" ]; then + comment 'Miscellaneous USB options' + bool ' Enable lots of ISOC debugging output' CONFIG_USB_DEBUG_ISOC + if [ "$CONFIG_PROC_FS" != "n" ]; then bool ' Preliminary /proc/bus/usb support' CONFIG_USB_PROC - fi - dep_tristate ' EZUSB Firmware downloader' CONFIG_USB_EZUSB $CONFIG_USB + fi + dep_tristate ' EZUSB Firmware downloader' CONFIG_USB_EZUSB $CONFIG_USB -comment 'USB Devices' - dep_tristate ' USB hub support (Required!)' CONFIG_USB_HUB $CONFIG_USB - dep_tristate ' USB mouse support' CONFIG_USB_MOUSE $CONFIG_USB - dep_tristate ' USB HP scanner support' CONFIG_USB_HP_SCANNER $CONFIG_USB - dep_tristate ' USB keyboard support' CONFIG_USB_KBD $CONFIG_USB - dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB - dep_tristate ' USB Communications Device Class (ACM) support' CONFIG_USB_ACM $CONFIG_USB - dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB - dep_tristate ' USB Belkin and Peracom serial support' CONFIG_USB_SERIAL $CONFIG_USB - dep_tristate ' USB CPiA Camera support' CONFIG_USB_CPIA $CONFIG_USB - dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB - dep_tristate ' USB SCSI Support' CONFIG_USB_SCSI $CONFIG_USB - if [ "$CONFIG_USB_SCSI" != "n" ]; then + comment 'USB Devices' + dep_tristate ' USB hub support (Required!)' CONFIG_USB_HUB $CONFIG_USB + dep_tristate ' USB mouse support' CONFIG_USB_MOUSE $CONFIG_USB + dep_tristate ' USB HP scanner support' CONFIG_USB_HP_SCANNER $CONFIG_USB + dep_tristate ' USB keyboard support' CONFIG_USB_KBD $CONFIG_USB + dep_tristate ' USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB + dep_tristate ' USB Communications Device Class (ACM) support' CONFIG_USB_ACM $CONFIG_USB + dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB + dep_tristate ' USB Belkin and Peracom serial support' CONFIG_USB_SERIAL $CONFIG_USB + dep_tristate ' USB CPiA Camera support' CONFIG_USB_CPIA $CONFIG_USB + dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB + dep_tristate ' USB SCSI Support' CONFIG_USB_SCSI $CONFIG_USB + if [ "$CONFIG_USB_SCSI" != "n" ]; then bool ' USB SCSI verbose debug' CONFIG_USB_SCSI_DEBUG - fi - dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT -fi + fi + dep_tristate ' USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT + fi -endmenu + endmenu +fi -- Niels Kristian Bech Jensen -- nkbj@image.dk -- http://www.image.dk/~nkbj/
----------->> Stop software piracy --- use free software! <<-----------
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
| |