diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i386.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i386.config
index 16e56530d3361d06905372e949b1de71081b2c10..f01ab1e1d084774a3708e5d741b224249200475e 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i386.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i386.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_X86=y
 # CONFIG_SBUS is not set
@@ -67,11 +67,11 @@ CONFIG_MTRR=y
 # CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_UP_IOAPIC is not set
 # CONFIG_X86_TSC_DISABLE is not set
-CONFIG_NOBIGSTACK=y
+# CONFIG_NOBIGSTACK is not set
 # CONFIG_STACK_SIZE_16KB is not set
 # CONFIG_STACK_SIZE_32KB is not set
-# CONFIG_STACK_SIZE_64KB is not set
-CONFIG_STACK_SIZE_SHIFT=1
+CONFIG_STACK_SIZE_64KB=y
+CONFIG_STACK_SIZE_SHIFT=4
 
 #
 # General setup
@@ -161,19 +161,11 @@ CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_XD=m
 CONFIG_PARIDE=m
 CONFIG_PARIDE_PARPORT=m
-
-#
-# Parallel IDE high-level drivers
-#
 CONFIG_PARIDE_PD=m
 CONFIG_PARIDE_PCD=m
 CONFIG_PARIDE_PF=m
 CONFIG_PARIDE_PT=m
 CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
 CONFIG_PARIDE_ATEN=m
 CONFIG_PARIDE_BPCK=m
 CONFIG_PARIDE_BPCK6=m
@@ -219,10 +211,6 @@ CONFIG_BLK_DEV_LVM=m
 #
 CONFIG_CRYPTO=m
 CONFIG_CIPHERS=m
-
-#
-# 128 bit blocksize
-#
 CONFIG_CIPHER_AES=m
 CONFIG_CIPHER_IDENTITY=m
 CONFIG_CRYPTODEV=m
@@ -350,10 +338,6 @@ CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -432,10 +416,6 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -447,10 +427,6 @@ CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=y
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_ISAPNP=y
@@ -507,10 +483,6 @@ CONFIG_BLK_DEV_ATARAID_SII=m
 # SCSI support
 #
 CONFIG_SCSI=m
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -519,10 +491,6 @@ CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_SR_EXTRA_DEVS=4
 CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 # CONFIG_SCSI_DEBUG_QUEUES is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
@@ -649,16 +617,8 @@ CONFIG_NET_FC=y
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=m
-
-#
-# Device Drivers
-#
 # CONFIG_IEEE1394_PCILYNX is not set
 CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_SBP2_PHYS_DMA=y
@@ -833,17 +793,9 @@ CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_NET_WIRELESS=y
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES_OLD=m
 
 #
@@ -955,19 +907,11 @@ CONFIG_ATM_FORE200E=m
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-#
-# AX.25 network device drivers
-#
-
 #
 # AX.25 network device drivers
 #
@@ -996,18 +940,10 @@ CONFIG_SOUNDMODEM_FSK9600=y
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -1015,16 +951,8 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Infrared-port device drivers
 #
-
-#
-# SIR device drivers
-#
 CONFIG_IRTTY_SIR=m
 CONFIG_IRPORT_SIR=m
-
-#
-# Dongle support
-#
 CONFIG_DONGLE=y
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
@@ -1035,10 +963,6 @@ CONFIG_MCP2120_DONGLE=m
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_ACT200L_DONGLE=m
 CONFIG_MA600_DONGLE=m
-
-#
-# FIR device drivers
-#
 CONFIG_USB_IRDA=m
 CONFIG_NSC_FIR=m
 CONFIG_WINBOND_FIR=m
@@ -1066,19 +990,11 @@ CONFIG_ISDN_TTY_FAX=y
 CONFIG_ISDN_DRV_LOOP=m
 # CONFIG_ISDN_DIVERSION is not set
 
-#
-# low-level hardware drivers
-#
-
 #
 # Passive ISDN cards
 #
 CONFIG_ISDN_DRV_HISAX=m
 CONFIG_ISDN_HISAX=y
-
-#
-#   D-channel protocol features
-#
 CONFIG_HISAX_EURO=y
 CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_SENDCOMPLETE is not set
@@ -1087,10 +1003,6 @@ CONFIG_DE_AOC=y
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_AVM_A1=y
@@ -1304,10 +1216,6 @@ CONFIG_INPUT_CS461X=m
 CONFIG_INPUT_EMU10K1=m
 CONFIG_INPUT_SERIO=m
 CONFIG_INPUT_SERPORT=m
-
-#
-# Joysticks
-#
 CONFIG_INPUT_ANALOG=m
 CONFIG_INPUT_A3D=m
 CONFIG_INPUT_ADI=m
@@ -1376,10 +1284,6 @@ CONFIG_SONYPI=m
 CONFIG_FTAPE=m
 CONFIG_ZFTAPE=m
 CONFIG_ZFT_DFLT_BLK_SZ=10240
-
-#
-#   The compressor will be built as a module only!
-#
 CONFIG_ZFT_COMPRESSOR=m
 CONFIG_FT_NR_BUFFERS=3
 # CONFIG_FT_PROC_FS is not set
@@ -1387,10 +1291,6 @@ CONFIG_FT_NORMAL_DEBUG=y
 # CONFIG_FT_FULL_DEBUG is not set
 # CONFIG_FT_NO_TRACE is not set
 # CONFIG_FT_NO_TRACE_AT_ALL is not set
-
-#
-# Hardware configuration
-#
 CONFIG_FT_STD_FDC=y
 # CONFIG_FT_MACH2 is not set
 # CONFIG_FT_PROBE_FC10 is not set
@@ -1427,10 +1327,6 @@ CONFIG_VIDEO_DEV=m
 #
 CONFIG_VIDEO_PROC_FS=y
 CONFIG_I2C_PARPORT=m
-
-#
-# Video Adapters
-#
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_BWQCAM=m
@@ -1786,30 +1682,14 @@ CONFIG_SOUND_TVMIXER=m
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 # CONFIG_USB_EMI26 is not set
-
-#
-#   USB Bluetooth can only be used with disabled Bluetooth subsystem
-#
 CONFIG_USB_MIDI=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1823,10 +1703,6 @@ CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
-
-#
-# USB Human Interface Devices (HID)
-#
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_USB_HIDDEV=y
@@ -1836,19 +1712,11 @@ CONFIG_USB_AIPTEK=m
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 # CONFIG_USB_DC2XX is not set
 CONFIG_USB_MDC800=m
 CONFIG_USB_SCANNER=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m
@@ -1858,20 +1726,12 @@ CONFIG_USB_STV680=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_DABUSB=m
-
-#
-# USB Network adaptors
-#
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m
-
-#
-# USB port drivers
-#
 CONFIG_USB_USS720=m
 
 #
@@ -1911,10 +1771,6 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OMNINET=m
-
-#
-# USB Miscellaneous drivers
-#
 CONFIG_USB_RIO500=m
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_TIGL=m
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
index 78771c317ad3420a29353fb032e2905ca3167b9e..a08d9234b8546879b93abd53db0c0a411c0bb8cb 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 CONFIG_X86=y
 # CONFIG_SBUS is not set
@@ -78,11 +78,11 @@ CONFIG_SMP=y
 # CONFIG_X86_TSC_DISABLE is not set
 CONFIG_X86_TSC=y
 CONFIG_HAVE_DEC_LOCK=y
-CONFIG_NOBIGSTACK=y
+# CONFIG_NOBIGSTACK is not set
 # CONFIG_STACK_SIZE_16KB is not set
 # CONFIG_STACK_SIZE_32KB is not set
-# CONFIG_STACK_SIZE_64KB is not set
-CONFIG_STACK_SIZE_SHIFT=1
+CONFIG_STACK_SIZE_64KB=y
+CONFIG_STACK_SIZE_SHIFT=4
 
 #
 # General setup
@@ -175,19 +175,11 @@ CONFIG_BLK_DEV_FD=y
 CONFIG_BLK_DEV_XD=m
 CONFIG_PARIDE=m
 CONFIG_PARIDE_PARPORT=m
-
-#
-# Parallel IDE high-level drivers
-#
 CONFIG_PARIDE_PD=m
 CONFIG_PARIDE_PCD=m
 CONFIG_PARIDE_PF=m
 CONFIG_PARIDE_PT=m
 CONFIG_PARIDE_PG=m
-
-#
-# Parallel IDE protocol modules
-#
 CONFIG_PARIDE_ATEN=m
 CONFIG_PARIDE_BPCK=m
 CONFIG_PARIDE_BPCK6=m
@@ -233,10 +225,6 @@ CONFIG_BLK_DEV_LVM=m
 #
 CONFIG_CRYPTO=m
 CONFIG_CIPHERS=m
-
-#
-# 128 bit blocksize
-#
 CONFIG_CIPHER_AES=m
 CONFIG_CIPHER_IDENTITY=m
 CONFIG_CRYPTODEV=m
@@ -364,10 +352,6 @@ CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 CONFIG_ATM_BR2684_IPFILTER=y
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -446,10 +430,6 @@ CONFIG_IDE=y
 # IDE, ATA and ATAPI Block devices
 #
 CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_IDEDISK=y
@@ -461,10 +441,6 @@ CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=y
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_ISAPNP=y
@@ -521,10 +497,6 @@ CONFIG_BLK_DEV_ATARAID_SII=m
 # SCSI support
 #
 CONFIG_SCSI=m
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=m
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -533,10 +505,6 @@ CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_SR_EXTRA_DEVS=4
 CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
 # CONFIG_SCSI_DEBUG_QUEUES is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_CONSTANTS=y
@@ -663,16 +631,8 @@ CONFIG_NET_FC=y
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=m
-
-#
-# Device Drivers
-#
 # CONFIG_IEEE1394_PCILYNX is not set
 CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_SBP2_PHYS_DMA=y
@@ -847,17 +807,9 @@ CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_NET_WIRELESS=y
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES_OLD=m
 
 #
@@ -969,19 +921,11 @@ CONFIG_ATM_FORE200E=m
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 
-#
-# AX.25 network device drivers
-#
-
 #
 # AX.25 network device drivers
 #
@@ -1010,18 +954,10 @@ CONFIG_SOUNDMODEM_FSK9600=y
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -1029,16 +965,8 @@ CONFIG_IRDA_FAST_RR=y
 #
 # Infrared-port device drivers
 #
-
-#
-# SIR device drivers
-#
 CONFIG_IRTTY_SIR=m
 CONFIG_IRPORT_SIR=m
-
-#
-# Dongle support
-#
 CONFIG_DONGLE=y
 CONFIG_ESI_DONGLE=m
 CONFIG_ACTISYS_DONGLE=m
@@ -1049,10 +977,6 @@ CONFIG_MCP2120_DONGLE=m
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_ACT200L_DONGLE=m
 CONFIG_MA600_DONGLE=m
-
-#
-# FIR device drivers
-#
 CONFIG_USB_IRDA=m
 CONFIG_NSC_FIR=m
 CONFIG_WINBOND_FIR=m
@@ -1080,19 +1004,11 @@ CONFIG_ISDN_TTY_FAX=y
 CONFIG_ISDN_DRV_LOOP=m
 # CONFIG_ISDN_DIVERSION is not set
 
-#
-# low-level hardware drivers
-#
-
 #
 # Passive ISDN cards
 #
 CONFIG_ISDN_DRV_HISAX=m
 CONFIG_ISDN_HISAX=y
-
-#
-#   D-channel protocol features
-#
 CONFIG_HISAX_EURO=y
 CONFIG_DE_AOC=y
 # CONFIG_HISAX_NO_SENDCOMPLETE is not set
@@ -1101,10 +1017,6 @@ CONFIG_DE_AOC=y
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
 CONFIG_HISAX_AVM_A1=y
@@ -1318,10 +1230,6 @@ CONFIG_INPUT_CS461X=m
 CONFIG_INPUT_EMU10K1=m
 CONFIG_INPUT_SERIO=m
 CONFIG_INPUT_SERPORT=m
-
-#
-# Joysticks
-#
 CONFIG_INPUT_ANALOG=m
 CONFIG_INPUT_A3D=m
 CONFIG_INPUT_ADI=m
@@ -1390,10 +1298,6 @@ CONFIG_SONYPI=m
 CONFIG_FTAPE=m
 CONFIG_ZFTAPE=m
 CONFIG_ZFT_DFLT_BLK_SZ=10240
-
-#
-#   The compressor will be built as a module only!
-#
 CONFIG_ZFT_COMPRESSOR=m
 CONFIG_FT_NR_BUFFERS=3
 # CONFIG_FT_PROC_FS is not set
@@ -1401,10 +1305,6 @@ CONFIG_FT_NORMAL_DEBUG=y
 # CONFIG_FT_FULL_DEBUG is not set
 # CONFIG_FT_NO_TRACE is not set
 # CONFIG_FT_NO_TRACE_AT_ALL is not set
-
-#
-# Hardware configuration
-#
 CONFIG_FT_STD_FDC=y
 # CONFIG_FT_MACH2 is not set
 # CONFIG_FT_PROBE_FC10 is not set
@@ -1423,10 +1323,6 @@ CONFIG_AGP_ALI=y
 CONFIG_AGP_SWORKS=y
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
@@ -1455,10 +1351,6 @@ CONFIG_VIDEO_DEV=m
 #
 CONFIG_VIDEO_PROC_FS=y
 CONFIG_I2C_PARPORT=m
-
-#
-# Video Adapters
-#
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_BWQCAM=m
@@ -1814,30 +1706,14 @@ CONFIG_SOUND_TVMIXER=m
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 # CONFIG_USB_EMI26 is not set
-
-#
-#   USB Bluetooth can only be used with disabled Bluetooth subsystem
-#
 CONFIG_USB_MIDI=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
@@ -1851,10 +1727,6 @@ CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
-
-#
-# USB Human Interface Devices (HID)
-#
 CONFIG_USB_HID=m
 CONFIG_USB_HIDINPUT=y
 CONFIG_USB_HIDDEV=y
@@ -1864,19 +1736,11 @@ CONFIG_USB_AIPTEK=m
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 # CONFIG_USB_DC2XX is not set
 CONFIG_USB_MDC800=m
 CONFIG_USB_SCANNER=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USB_HPUSBSCSI=m
-
-#
-# USB Multimedia devices
-#
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m
@@ -1886,20 +1750,12 @@ CONFIG_USB_STV680=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_DABUSB=m
-
-#
-# USB Network adaptors
-#
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_CATC=m
 CONFIG_USB_CDCETHER=m
 CONFIG_USB_USBNET=m
-
-#
-# USB port drivers
-#
 CONFIG_USB_USS720=m
 
 #
@@ -1939,10 +1795,6 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OMNINET=m
-
-#
-# USB Miscellaneous drivers
-#
 CONFIG_USB_RIO500=m
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_TIGL=m