r1508 - trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config

Sven Luther luther@haydn.debian.org
Thu, 02 Sep 2004 00:09:53 -0600


Author: luther
Date: 2004-09-02 00:09:50 -0600 (Thu, 02 Sep 2004)
New Revision: 1508

Modified:
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power3
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power4
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-small
   trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-smp
Log:
Fixed the removal of rivafb.


Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power3
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power3	2004-09-02 05:14:54 UTC (rev 1507)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power3	2004-09-02 06:09:50 UTC (rev 1508)
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 # CONFIG_UID16 is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -34,7 +34,6 @@
 CONFIG_ALL_PPC=y
 CONFIG_PPC_ISATIMER=y
 CONFIG_PPC_STD_MMU=y
-# CONFIG_CPU_FREQ is not set
 CONFIG_SMP=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_NR_CPUS=32
@@ -116,19 +115,11 @@
 # CONFIG_BLK_DEV_XD is not set
 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 is not set
@@ -273,10 +264,6 @@
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -287,10 +274,6 @@
 CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
 CONFIG_IP_VS_FTP=m
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -336,10 +319,6 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -407,10 +386,6 @@
 # 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
@@ -422,10 +397,6 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -472,7 +443,6 @@
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
-# CONFIG_PMU_HD_BLINK is not set
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -489,10 +459,6 @@
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -502,10 +468,6 @@
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SCH=m
 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=y
 CONFIG_SCSI_CONSTANTS=y
@@ -622,16 +584,8 @@
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=y
-
-#
-# Device Drivers
-#
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=y
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -795,10 +749,6 @@
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
@@ -884,10 +834,6 @@
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
@@ -896,10 +842,6 @@
 #
 # AX.25 network device drivers
 #
-
-#
-# AX.25 network device drivers
-#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -925,18 +867,10 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -944,16 +878,8 @@
 #
 # 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
@@ -964,10 +890,6 @@
 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
@@ -999,18 +921,10 @@
 CONFIG_ISDN_DIVERSION=m
 
 #
-# 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
@@ -1019,10 +933,6 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 # CONFIG_HISAX_TELESPCI is not set
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_FRITZPCI=y
@@ -1092,7 +1002,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA= is not set
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_CLGEN=m
 CONFIG_FB_PM2=m
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
@@ -1242,10 +1152,6 @@
 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
@@ -1267,18 +1173,6 @@
 CONFIG_INPUT_TURBOGRAFX=m
 CONFIG_QIC02_TAPE=m
 CONFIG_QIC02_DYNCONF=y
-
-#
-#   Setting runtime QIC-02 configuration is done with qic02conf
-#
-
-#
-#   from the tpqic02-support package.  It is available at
-#
-
-#
-#   metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
@@ -1330,10 +1224,6 @@
 #
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
@@ -1361,10 +1251,6 @@
 #
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
-
-#
-# Video Adapters
-#
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_PLANB is not set
@@ -1405,8 +1291,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1572,6 +1456,8 @@
 CONFIG_SOUND=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_I2C=m
+CONFIG_I2C_KEYWEST=m
 CONFIG_SOUND_ALI5455=m
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE is not set
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA is not set
@@ -1654,30 +1540,14 @@
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=y
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 CONFIG_USB_EMI26=m
-
-#
-#   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
@@ -1691,10 +1561,6 @@
 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
@@ -1704,19 +1570,11 @@
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 CONFIG_USB_DC2XX=m
 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
@@ -1726,20 +1584,12 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=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
 
 #
@@ -1767,10 +1617,6 @@
 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
@@ -1787,10 +1633,6 @@
 CONFIG_USB_NET2280=m
 CONFIG_USB_GADGET_CONTROLLER=m
 CONFIG_USB_GADGET_DUALSPEED=y
-
-#
-# USB Gadget Drivers
-#
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y

Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power4
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power4	2004-09-02 05:14:54 UTC (rev 1507)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/power4	2004-09-02 06:09:50 UTC (rev 1508)
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 # CONFIG_UID16 is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -34,7 +34,6 @@
 CONFIG_ALL_PPC=y
 CONFIG_PPC_ISATIMER=y
 CONFIG_PPC_STD_MMU=y
-# CONFIG_CPU_FREQ is not set
 CONFIG_SMP=y
 # CONFIG_IRQ_ALL_CPUS is not set
 CONFIG_NR_CPUS=32
@@ -118,19 +117,11 @@
 # CONFIG_BLK_DEV_XD is not set
 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 is not set
@@ -275,10 +266,6 @@
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -289,10 +276,6 @@
 CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
 CONFIG_IP_VS_FTP=m
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -338,10 +321,6 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -409,10 +388,6 @@
 # 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
@@ -424,10 +399,6 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -475,7 +446,6 @@
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
-# CONFIG_PMU_HD_BLINK is not set
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -493,10 +463,6 @@
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -506,10 +472,6 @@
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SCH=m
 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=y
 CONFIG_SCSI_CONSTANTS=y
@@ -626,16 +588,8 @@
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=y
-
-#
-# Device Drivers
-#
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=y
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -799,10 +753,6 @@
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
@@ -888,10 +838,6 @@
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
@@ -900,10 +846,6 @@
 #
 # AX.25 network device drivers
 #
-
-#
-# AX.25 network device drivers
-#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -929,18 +871,10 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -948,16 +882,8 @@
 #
 # 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
@@ -968,10 +894,6 @@
 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
@@ -1003,18 +925,10 @@
 CONFIG_ISDN_DIVERSION=m
 
 #
-# 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
@@ -1023,10 +937,6 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 # CONFIG_HISAX_TELESPCI is not set
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_FRITZPCI=y
@@ -1096,7 +1006,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA= is not set
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_CLGEN=m
 CONFIG_FB_PM2=m
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
@@ -1183,7 +1093,6 @@
 # CONFIG_MAC_ADBKEYCODES is not set
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_MAC_HID=y
-CONFIG_THERM_PM72=m
 
 #
 # Character devices
@@ -1241,10 +1150,6 @@
 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
@@ -1266,18 +1171,6 @@
 CONFIG_INPUT_TURBOGRAFX=m
 CONFIG_QIC02_TAPE=m
 CONFIG_QIC02_DYNCONF=y
-
-#
-#   Setting runtime QIC-02 configuration is done with qic02conf
-#
-
-#
-#   from the tpqic02-support package.  It is available at
-#
-
-#
-#   metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
@@ -1332,17 +1225,12 @@
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_ATI is not set
-CONFIG_AGP_UNINORTH=y
 
 #
 # Direct Rendering Manager (XFree86 DRI support)
 #
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
@@ -1370,10 +1258,6 @@
 #
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
-
-#
-# Video Adapters
-#
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_PLANB is not set
@@ -1414,8 +1298,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1581,6 +1463,8 @@
 CONFIG_SOUND=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_I2C=m
+CONFIG_I2C_KEYWEST=m
 CONFIG_SOUND_ALI5455=m
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE is not set
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA is not set
@@ -1663,30 +1547,14 @@
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=y
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 CONFIG_USB_EMI26=m
-
-#
-#   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
@@ -1700,10 +1568,6 @@
 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
@@ -1713,19 +1577,11 @@
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 CONFIG_USB_DC2XX=m
 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
@@ -1735,20 +1591,12 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=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
 
 #
@@ -1776,10 +1624,6 @@
 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
@@ -1796,10 +1640,6 @@
 CONFIG_USB_NET2280=m
 CONFIG_USB_GADGET_CONTROLLER=m
 CONFIG_USB_GADGET_DUALSPEED=y
-
-#
-# USB Gadget Drivers
-#
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y

Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc	2004-09-02 05:14:54 UTC (rev 1507)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc	2004-09-02 06:09:50 UTC (rev 1508)
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 # CONFIG_UID16 is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -32,9 +32,6 @@
 # CONFIG_8xx is not set
 # CONFIG_8260 is not set
 CONFIG_PPC_STD_MMU=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_24_API=y
-CONFIG_CPU_FREQ_PMAC=y
 CONFIG_ALL_PPC=y
 # CONFIG_APUS is not set
 # CONFIG_SPRUCE is not set
@@ -129,19 +126,11 @@
 # CONFIG_BLK_DEV_XD is not set
 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 is not set
@@ -286,10 +275,6 @@
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -300,10 +285,6 @@
 CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
 CONFIG_IP_VS_FTP=m
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -349,10 +330,6 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -420,10 +397,6 @@
 # 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
@@ -435,10 +408,6 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -486,7 +455,6 @@
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
-# CONFIG_PMU_HD_BLINK is not set
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -504,10 +472,6 @@
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -517,10 +481,6 @@
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SCH=m
 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=y
 CONFIG_SCSI_CONSTANTS=y
@@ -637,16 +597,8 @@
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=y
-
-#
-# Device Drivers
-#
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=y
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -810,10 +762,6 @@
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
@@ -899,10 +847,6 @@
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
@@ -911,10 +855,6 @@
 #
 # AX.25 network device drivers
 #
-
-#
-# AX.25 network device drivers
-#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -940,18 +880,10 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -959,16 +891,8 @@
 #
 # 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
@@ -979,10 +903,6 @@
 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
@@ -1014,18 +934,10 @@
 CONFIG_ISDN_DIVERSION=m
 
 #
-# 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
@@ -1034,10 +946,6 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 # CONFIG_HISAX_TELESPCI is not set
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_FRITZPCI=y
@@ -1107,7 +1015,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA= is not set
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_CLGEN=m
 CONFIG_FB_PM2=m
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
@@ -1260,10 +1168,6 @@
 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
@@ -1285,18 +1189,6 @@
 CONFIG_INPUT_TURBOGRAFX=m
 CONFIG_QIC02_TAPE=m
 CONFIG_QIC02_DYNCONF=y
-
-#
-#   Setting runtime QIC-02 configuration is done with qic02conf
-#
-
-#
-#   from the tpqic02-support package.  It is available at
-#
-
-#
-#   metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
@@ -1351,17 +1243,12 @@
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_ATI is not set
-CONFIG_AGP_UNINORTH=y
 
 #
 # Direct Rendering Manager (XFree86 DRI support)
 #
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
@@ -1389,10 +1276,6 @@
 #
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
-
-#
-# Video Adapters
-#
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_PLANB is not set
@@ -1433,8 +1316,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1600,6 +1481,8 @@
 CONFIG_SOUND=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_I2C=m
+CONFIG_I2C_KEYWEST=m
 CONFIG_SOUND_ALI5455=m
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE is not set
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA is not set
@@ -1682,30 +1565,14 @@
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=y
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 CONFIG_USB_EMI26=m
-
-#
-#   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
@@ -1719,10 +1586,6 @@
 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
@@ -1732,19 +1595,11 @@
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 CONFIG_USB_DC2XX=m
 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
@@ -1754,20 +1609,12 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=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
 
 #
@@ -1795,10 +1642,6 @@
 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
@@ -1815,10 +1658,6 @@
 CONFIG_USB_NET2280=m
 CONFIG_USB_GADGET_CONTROLLER=m
 CONFIG_USB_GADGET_DUALSPEED=y
-
-#
-# USB Gadget Drivers
-#
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y

Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-small
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-small	2004-09-02 05:14:54 UTC (rev 1507)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-small	2004-09-02 06:09:50 UTC (rev 1508)
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 # CONFIG_UID16 is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -32,9 +32,6 @@
 # CONFIG_8xx is not set
 # CONFIG_8260 is not set
 CONFIG_PPC_STD_MMU=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_24_API=y
-CONFIG_CPU_FREQ_PMAC=y
 CONFIG_ALL_PPC=y
 # CONFIG_APUS is not set
 # CONFIG_SPRUCE is not set
@@ -129,19 +126,11 @@
 # CONFIG_BLK_DEV_XD is not set
 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 is not set
@@ -283,10 +272,6 @@
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -297,10 +282,6 @@
 CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
 CONFIG_IP_VS_FTP=m
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -346,10 +327,6 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -417,10 +394,6 @@
 # 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=m
@@ -432,10 +405,6 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -483,7 +452,6 @@
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
-# CONFIG_PMU_HD_BLINK is not set
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -501,10 +469,6 @@
 # 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
@@ -514,10 +478,6 @@
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SCH=m
 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=y
 CONFIG_SCSI_CONSTANTS=y
@@ -643,16 +603,8 @@
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=m
-
-#
-# Device Drivers
-#
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=m
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -816,10 +768,6 @@
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
@@ -905,10 +853,6 @@
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
@@ -917,10 +861,6 @@
 #
 # AX.25 network device drivers
 #
-
-#
-# AX.25 network device drivers
-#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -946,18 +886,10 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -965,16 +897,8 @@
 #
 # 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
@@ -985,10 +909,6 @@
 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
@@ -1020,18 +940,10 @@
 CONFIG_ISDN_DIVERSION=m
 
 #
-# 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
@@ -1040,10 +952,6 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 # CONFIG_HISAX_TELESPCI is not set
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_FRITZPCI=y
@@ -1113,7 +1021,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA= is not set
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_CLGEN=m
 CONFIG_FB_PM2=m
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
@@ -1265,10 +1173,6 @@
 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
@@ -1290,18 +1194,6 @@
 CONFIG_INPUT_TURBOGRAFX=m
 CONFIG_QIC02_TAPE=m
 CONFIG_QIC02_DYNCONF=y
-
-#
-#   Setting runtime QIC-02 configuration is done with qic02conf
-#
-
-#
-#   from the tpqic02-support package.  It is available at
-#
-
-#
-#   metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
@@ -1356,17 +1248,12 @@
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_ATI is not set
-CONFIG_AGP_UNINORTH=y
 
 #
 # Direct Rendering Manager (XFree86 DRI support)
 #
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
@@ -1394,10 +1281,6 @@
 #
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
-
-#
-# Video Adapters
-#
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_PLANB is not set
@@ -1438,8 +1321,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1605,6 +1486,8 @@
 CONFIG_SOUND=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_I2C=m
+CONFIG_I2C_KEYWEST=m
 CONFIG_SOUND_ALI5455=m
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE is not set
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA is not set
@@ -1687,30 +1570,14 @@
 #
 CONFIG_USB=m
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
-
-#
-# 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=m
-
-#
-#   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
@@ -1724,10 +1591,6 @@
 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
@@ -1737,19 +1600,11 @@
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 CONFIG_USB_DC2XX=m
 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
@@ -1759,20 +1614,12 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=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
 
 #
@@ -1800,10 +1647,6 @@
 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
@@ -1820,10 +1663,6 @@
 CONFIG_USB_NET2280=m
 CONFIG_USB_GADGET_CONTROLLER=m
 CONFIG_USB_GADGET_DUALSPEED=y
-
-#
-# USB Gadget Drivers
-#
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y

Modified: trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-smp
===================================================================
--- trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-smp	2004-09-02 05:14:54 UTC (rev 1507)
+++ trunk/kernel-2.4/powerpc/kernel-patch-powerpc-2.4.27-2.4.27/config/powerpc-smp	2004-09-02 06:09:50 UTC (rev 1508)
@@ -1,5 +1,5 @@
 #
-# Automatically generated make config: don't edit
+# Automatically generated by make menuconfig: don't edit
 #
 # CONFIG_UID16 is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -32,9 +32,6 @@
 # CONFIG_8xx is not set
 # CONFIG_8260 is not set
 CONFIG_PPC_STD_MMU=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_24_API=y
-CONFIG_CPU_FREQ_PMAC=y
 CONFIG_ALL_PPC=y
 # CONFIG_APUS is not set
 # CONFIG_SPRUCE is not set
@@ -131,19 +128,11 @@
 # CONFIG_BLK_DEV_XD is not set
 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 is not set
@@ -288,10 +277,6 @@
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_DEBUG is not set
 CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS scheduler
-#
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -302,10 +287,6 @@
 CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
 CONFIG_IP_VS_FTP=m
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
@@ -351,10 +332,6 @@
 CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 CONFIG_VLAN_8021Q=m
-
-#
-#  
-#
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
@@ -422,10 +399,6 @@
 # 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
@@ -437,10 +410,6 @@
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
 # CONFIG_BLK_DEV_CMD640 is not set
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 # CONFIG_BLK_DEV_ISAPNP is not set
@@ -488,7 +457,6 @@
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 CONFIG_BLK_DEV_IDEDMA_PMAC=y
 CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
-# CONFIG_PMU_HD_BLINK is not set
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDE_CHIPSETS is not set
@@ -506,10 +474,6 @@
 # SCSI support
 #
 CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
 CONFIG_BLK_DEV_SD=y
 CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=m
@@ -519,10 +483,6 @@
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SCH=m
 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=y
 CONFIG_SCSI_CONSTANTS=y
@@ -639,16 +599,8 @@
 # IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=y
-
-#
-# Device Drivers
-#
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
-
-#
-# Protocol Drivers
-#
 CONFIG_IEEE1394_VIDEO1394=m
 CONFIG_IEEE1394_SBP2=y
 # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
@@ -812,10 +764,6 @@
 CONFIG_PLX_HERMES=m
 CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
-
-#
-# Wireless Pcmcia cards support
-#
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
@@ -901,10 +849,6 @@
 # Amateur Radio support
 #
 CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
 CONFIG_AX25=m
 # CONFIG_AX25_DAMA_SLAVE is not set
 CONFIG_NETROM=m
@@ -913,10 +857,6 @@
 #
 # AX.25 network device drivers
 #
-
-#
-# AX.25 network device drivers
-#
 CONFIG_MKISS=m
 CONFIG_6PACK=m
 CONFIG_BPQETHER=m
@@ -942,18 +882,10 @@
 # IrDA (infrared) support
 #
 CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
-
-#
-# IrDA options
-#
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 # CONFIG_IRDA_DEBUG is not set
@@ -961,16 +893,8 @@
 #
 # 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
@@ -981,10 +905,6 @@
 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
@@ -1016,18 +936,10 @@
 CONFIG_ISDN_DIVERSION=m
 
 #
-# 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
@@ -1036,10 +948,6 @@
 CONFIG_HISAX_1TR6=y
 CONFIG_HISAX_NI1=y
 CONFIG_HISAX_MAX_CARDS=8
-
-#
-#   HiSax supported cards
-#
 # CONFIG_HISAX_TELESPCI is not set
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_FRITZPCI=y
@@ -1109,7 +1017,7 @@
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FB_RIVA= is not set
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_CLGEN=m
 CONFIG_FB_PM2=m
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
@@ -1262,10 +1170,6 @@
 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
@@ -1287,18 +1191,6 @@
 CONFIG_INPUT_TURBOGRAFX=m
 CONFIG_QIC02_TAPE=m
 CONFIG_QIC02_DYNCONF=y
-
-#
-#   Setting runtime QIC-02 configuration is done with qic02conf
-#
-
-#
-#   from the tpqic02-support package.  It is available at
-#
-
-#
-#   metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/
-#
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 # CONFIG_IPMI_DEVICE_INTERFACE is not set
@@ -1353,17 +1245,12 @@
 # CONFIG_AGP_ALI is not set
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_ATI is not set
-CONFIG_AGP_UNINORTH=y
 
 #
 # Direct Rendering Manager (XFree86 DRI support)
 #
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set
-
-#
-# DRM 4.1 drivers
-#
 CONFIG_DRM_NEW=y
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
@@ -1391,10 +1278,6 @@
 #
 CONFIG_VIDEO_PROC_FS=y
 # CONFIG_I2C_PARPORT is not set
-
-#
-# Video Adapters
-#
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_PLANB is not set
@@ -1435,8 +1318,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
@@ -1602,6 +1483,8 @@
 CONFIG_SOUND=m
 CONFIG_DMASOUND_PMAC=m
 CONFIG_DMASOUND=m
+CONFIG_I2C=m
+CONFIG_I2C_KEYWEST=m
 CONFIG_SOUND_ALI5455=m
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_PCMOUTSHARE is not set
 # CONFIG_SOUND_ALI5455_CODECSPDIFOUT_CODECINDEPENDENTDMA is not set
@@ -1684,30 +1567,14 @@
 #
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
-
-#
-# USB Host Controller Drivers
-#
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_UHCI=y
 # CONFIG_USB_UHCI_ALT is not set
 CONFIG_USB_OHCI=y
-
-#
-# USB Device Class drivers
-#
 CONFIG_USB_AUDIO=m
 CONFIG_USB_EMI26=m
-
-#
-#   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
@@ -1721,10 +1588,6 @@
 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
@@ -1734,19 +1597,11 @@
 CONFIG_USB_WACOM=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-
-#
-# USB Imaging devices
-#
 CONFIG_USB_DC2XX=m
 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
@@ -1756,20 +1611,12 @@
 CONFIG_USB_W9968CF=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=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
 
 #
@@ -1797,10 +1644,6 @@
 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
@@ -1817,10 +1660,6 @@
 CONFIG_USB_NET2280=m
 CONFIG_USB_GADGET_CONTROLLER=m
 CONFIG_USB_GADGET_DUALSPEED=y
-
-#
-# USB Gadget Drivers
-#
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y