- crypto, reiser, ipvs, atm removed (new patches are neccessary),

- enabled all possible DRM and USB options.

Changed options:
CONFIG_SCSI_GENERIC_NCR53C400	n -> y
CONFIG_SCSI_IZIP_EPP16		n -> y
CONFIG_IRDA_DEBUG		n -> y
CONFIG_WDT_501			n -> y
CONFIG_WDT_501			n -> y
CONFIG_WDT_501_FAN		n -> y
CONFIG_WDTPCI			n -> m
CONFIG_ADFS_FS			n -> m
CONFIG_QNX4FS_FS		n -> m
CONFIG_QNX4FS_RW		n -> y
CONFIG_FB_ATY128		n -> m

New options:
CONFIG_MICROCODE		m
CONFIG_X86_MSR			m
CONFIG_X86_CPUID		m
CONFIG_BLK_DEV_CS5530		y
CONFIG_BLK_CPQ_CISS_DA		m
CONFIG_SCSI_CPQFCTS		m
CONFIG_RTL8139TOO		m
CONFIG_SKFP			m
CONFIG_XPEED			m
CONFIG_RADIO_MAESTRO		m
CONFIG_RADIO_MIROPCM20		m
CONFIG_NFSD_TCP			y
CONFIG_SMB_NLS_DEFAULT		y
CONFIG_SMB_NLS_REMOTE		cp437
CONFIG_SOUND_VIA82CXXX		m

Removed options:
CONFIG_IDEDISK_MULTI_MODE	y
CONFIG_IDEPCI_SHARE_IRQ		y
CONFIG_IDEDMA_PCI_EXPERIMENTAL	y
CONFIG_BLK_DEV_AEC62XX		y
CONFIG_BLK_DEV_CMD64X		y
CONFIG_BLK_DEV_CS5530		y
CONFIG_BLK_DEV_HPT34X		y
CONFIG_BLK_DEV_HPT366		y
CONFIG_BLK_DEV_PIIX		y
CONFIG_BLK_DEV_PDC202XX		y
CONFIG_PDC202XX_BURST		y
CONFIG_BLK_DEV_SIS5513		y
CONFIG_BLK_DEV_VIA82CXXX	y
CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK	y
CONFIG_BLK_DEV_LOOP_GEN_SEL	m
CONFIG_BLK_DEV_LOOP_GEN		m
CONFIG_BLK_DEV_LOOP_FISH2	m
CONFIG_AUTODETECT_RAID		y
CONFIG_BLK_DEV_IDE_MODES	y
CONFIG_CIPE			m
CONFIG_NET_SECURITY		y
CONFIG_SCSI_NCR53C8XX_PROFILE	y
CONFIG_RADIO_MIROPCM20		m
CONFIG_SOUND_VIA82CXXX		m

Changed files:
    kernel-i386-smp.config -> 1.5
    kernel-i386.config -> 1.26
    kernel-i586-smp.config -> 1.24
    kernel-i586.config -> 1.24
    kernel-i686-smp.config -> 1.27
    kernel-i686.config -> 1.28

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index 6825da9e9b6fff22884108a29e6c1d085f2860f2..8320d2741f12bfff8fe3da263b59330fa8a3bc3c 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -15,9 +15,12 @@ CONFIG_M386=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 CONFIG_SMP=y
 
@@ -60,30 +63,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -97,55 +81,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -172,20 +133,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -211,13 +170,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -233,12 +185,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -246,6 +192,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -263,7 +210,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -330,6 +276,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -340,14 +287,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -361,7 +308,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -436,6 +382,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -485,6 +432,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -555,23 +503,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -588,7 +523,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -778,7 +713,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -786,6 +723,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -793,6 +731,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -802,15 +746,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -842,12 +787,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -862,14 +863,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -881,9 +881,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -961,7 +964,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1014,6 +1017,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1026,7 +1030,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m

diff --git a/kernel-i386.config b/kernel-i386.config
index 2fc6acf0323db195841bdea670b334a60ec68d2e..86764cd96e1c7d3628a8db88689fc760e29b6e50 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -15,9 +15,12 @@ CONFIG_M386=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y
 CONFIG_MTRR=y
 # CONFIG_SMP is not set
 
@@ -58,30 +61,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -95,55 +79,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -170,20 +131,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -209,13 +168,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -231,12 +183,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -244,6 +190,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -261,7 +208,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -328,6 +274,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -338,14 +285,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -359,7 +306,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -434,6 +380,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -483,6 +430,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -553,23 +501,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -586,7 +521,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -776,7 +711,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -784,6 +721,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -791,6 +729,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -800,15 +744,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -840,12 +785,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -860,14 +861,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -879,9 +879,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -959,7 +962,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1012,6 +1015,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1024,7 +1028,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m

diff --git a/kernel-i586-smp.config b/kernel-i586-smp.config
index 8d5903a38507799218bb418ee869b52178264d68..b89dc84a77e4c7c29edb005bd5fa96cedceb8dee 100644 (file)
--- a/kernel-i586-smp.config
+++ b/kernel-i586-smp.config
@@ -19,6 +19,9 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
 # CONFIG_MATH_EMULATION is not set
@@ -64,30 +67,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -101,55 +85,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -176,20 +137,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -215,13 +174,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -237,12 +189,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -250,6 +196,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -267,7 +214,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -334,6 +280,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -344,14 +291,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -365,7 +312,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -440,6 +386,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -489,6 +436,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -559,23 +507,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -592,7 +527,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -782,7 +717,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -790,6 +727,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -797,6 +735,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -806,15 +750,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -846,12 +791,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -866,14 +867,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -885,9 +885,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -965,7 +968,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1018,6 +1021,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1030,7 +1034,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m

diff --git a/kernel-i586.config b/kernel-i586.config
index 277c3fb5cc5f959de024db28b73ec59a980f0103..c44a4595f25fa81fea32ace216b05a610e9dd564 100644 (file)
--- a/kernel-i586.config
+++ b/kernel-i586.config
@@ -19,6 +19,9 @@ CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_INVLPG=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
 # CONFIG_MATH_EMULATION is not set
@@ -62,30 +65,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -99,55 +83,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -174,20 +135,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -213,13 +172,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -235,12 +187,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -248,6 +194,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -265,7 +212,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -332,6 +278,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -342,14 +289,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -363,7 +310,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -438,6 +384,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -487,6 +434,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -557,23 +505,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -590,7 +525,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -780,7 +715,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -788,6 +725,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -795,6 +733,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -804,15 +748,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -844,12 +789,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -864,14 +865,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -883,9 +883,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -963,7 +966,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1016,6 +1019,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1028,7 +1032,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m

diff --git a/kernel-i686-smp.config b/kernel-i686-smp.config
index 39131977f54f7a06bce39a005dcc5e66afd3abbe..47c9f7e00b6ae288cd450b1f34e1b5e6c204e8ee 100644 (file)
--- a/kernel-i686-smp.config
+++ b/kernel-i686-smp.config
@@ -21,6 +21,9 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
 # CONFIG_MATH_EMULATION is not set
@@ -66,30 +69,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -103,55 +87,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -178,20 +139,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -217,13 +176,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -239,12 +191,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -252,6 +198,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -269,7 +216,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -336,6 +282,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -346,14 +293,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -367,7 +314,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -442,6 +388,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -491,6 +438,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -561,23 +509,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -594,7 +529,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -784,7 +719,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -792,6 +729,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -799,6 +737,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -808,15 +752,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -848,12 +793,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -868,14 +869,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -887,9 +887,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -967,7 +970,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1020,6 +1023,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1032,7 +1036,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m

diff --git a/kernel-i686.config b/kernel-i686.config
index 79062f20c30bd39fc5a616472aa45191900991b4..d34b4841ab992f2f74cbbe1ff79de2778abe506c 100644 (file)
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -21,6 +21,9 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
 CONFIG_1GB=y
 # CONFIG_2GB is not set
 # CONFIG_MATH_EMULATION is not set
@@ -64,30 +67,11 @@ CONFIG_APM=y
 # CONFIG_APM_DO_ENABLE is not set
 # CONFIG_APM_CPU_IDLE is not set
 # CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_IGNORE_SUSPEND_BOUNCE is not set
 CONFIG_APM_RTC_IS_GMT=y
 # CONFIG_APM_ALLOW_INTS is not set
 CONFIG_APM_REAL_MODE_POWER_OFF=y
 CONFIG_TOSHIBA=m
 
-#
-# Crypto options
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=m
-CONFIG_CIPHER_BLOWFISH=m
-CONFIG_CIPHER_DES=m
-CONFIG_CIPHER_DES_EDE3=m
-CONFIG_CIPHER_DFC=m
-CONFIG_CIPHER_IDEA=m
-CONFIG_CIPHER_MARS=m
-CONFIG_CIPHER_RC5=m
-CONFIG_CIPHER_RC6=m
-CONFIG_CIPHER_SERPENT=m
-CONFIG_DIGEST=m
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-
 #
 # Plug and Play support
 #
@@ -101,55 +85,32 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_IDE=m
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=m
-CONFIG_IDEDISK_MULTI_MODE=y
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL_DEBUG is not set
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
 CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_IDEDMA_PCI_EXPERIMENTAL=y
-# CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_AEC62XX=y
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_CMD64X=y
-# CONFIG_BLK_DEV_CY82C693 is not set
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
+# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_SIS5513=y
+# CONFIG_BLK_DEV_ALI15X3 is not set
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_VIA82C586 is not set
+# CONFIG_BLK_DEV_CMD646 is not set
+CONFIG_BLK_DEV_CS5530=y
 # CONFIG_IDE_CHIPSETS is not set
-# CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
-CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
-CONFIG_BLK_DEV_LOOP_GEN=m
-# CONFIG_BLK_DEV_LOOP_CAST is not set
-CONFIG_BLK_DEV_LOOP_FISH2=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_MD=y
-CONFIG_AUTODETECT_RAID=y
 CONFIG_MD_LINEAR=m
 CONFIG_MD_STRIPED=m
 CONFIG_MD_MIRRORING=m
 CONFIG_MD_RAID5=m
-# CONFIG_MD_TRANSLUCENT is not set
-# CONFIG_MD_HSM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
@@ -176,20 +137,18 @@ CONFIG_PARIDE_KBIC=m
 CONFIG_PARIDE_KTTI=m
 CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
-CONFIG_BLK_DEV_IDE_MODES=y
 CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_BLK_DEV_HD is not set
 
 #
 # Networking options
 #
-CONFIG_CIPE=m
 CONFIG_PACKET=m
 CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NETLINK_DEV=y
 CONFIG_FIREWALL=y
-CONFIG_NET_SECURITY=y
 CONFIG_FILTER=y
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -215,13 +174,6 @@ CONFIG_IP_MASQUERADE_MOD=y
 CONFIG_IP_MASQUERADE_IPAUTOFW=m
 CONFIG_IP_MASQUERADE_IPPORTFW=m
 CONFIG_IP_MASQUERADE_MFW=m
-CONFIG_IP_MASQUERADE_VS=y
-CONFIG_IP_MASQUERADE_VS_TAB_BITS=12
-CONFIG_IP_MASQUERADE_VS_RR=m
-CONFIG_IP_MASQUERADE_VS_WRR=m
-CONFIG_IP_MASQUERADE_VS_LC=m
-CONFIG_IP_MASQUERADE_VS_WLC=m
-CONFIG_IP_MASQUERADE_VS_LBLC=m
 # CONFIG_IP_ROUTER is not set
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE=m
@@ -237,12 +189,6 @@ CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 CONFIG_IPV6_EUI64=y
 CONFIG_IPV6_NO_PB=y
-CONFIG_ATM=y
-CONFIG_ATM_SKB=y
-CONFIG_ATM_CLIP=y
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_SPX=m
@@ -250,6 +196,7 @@ CONFIG_ATALK=m
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 CONFIG_ECONET=m
 # CONFIG_ECONET_AUNUDP is not set
@@ -267,7 +214,6 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_ATM=y
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
@@ -334,6 +280,7 @@ CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_MEGARAID=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -344,14 +291,14 @@ CONFIG_SCSI_EATA_PIO=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
 CONFIG_SCSI_GENERIC_NCR5380=m
-# CONFIG_SCSI_GENERIC_NCR53C400 is not set
+CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_G_NCR5380_PORT=y
 # CONFIG_SCSI_G_NCR5380_MEM is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
+CONFIG_SCSI_IZIP_EPP16=y
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_SYM53C416=m
@@ -365,7 +312,6 @@ CONFIG_SCSI_SYM53C8XX=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=20
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
 # CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
 CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
@@ -440,6 +386,7 @@ CONFIG_NI5010=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
+CONFIG_RTL8139TOO=m
 CONFIG_NET_ISA=y
 CONFIG_AT1700=m
 CONFIG_E2100=m
@@ -489,6 +436,7 @@ CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
 CONFIG_FDDI=y
 # CONFIG_DEFXX is not set
+CONFIG_SKFP=m
 CONFIG_HIPPI=y
 CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
@@ -559,23 +507,10 @@ CONFIG_WANPIPE_CARDS=4
 CONFIG_WANPIPE_FR=y
 CONFIG_WANPIPE_PPP=y
 CONFIG_WANPIPE_CHDLC=y
+CONFIG_XPEED=m
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
-CONFIG_ATM_TCP=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-# CONFIG_ATM_ZATM is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_AMBASSADOR is not set
-# CONFIG_ATM_HORIZON is not set
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
 
 #
 # Amateur Radio support
@@ -592,7 +527,7 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRDA_OPTIONS=y
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
+CONFIG_IRDA_DEBUG=y
 CONFIG_IRDA_COMPRESSION=y
 CONFIG_IRDA_DEFLATE=m
 
@@ -782,7 +717,9 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 CONFIG_WDT=m
-# CONFIG_WDT_501 is not set
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_WDTPCI=m
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
@@ -790,6 +727,7 @@ CONFIG_60XX_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_NVRAM=m
 CONFIG_RTC=y
+# CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
@@ -797,6 +735,12 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_GAMMA=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
 
 #
 # Video For Linux
@@ -806,15 +750,16 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
-CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
 CONFIG_RADIO_TRUST=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_PP_DMA=y
+# CONFIG_VIDEO_CPIA_USB is not set
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_RADIO_SF16FMI=m
@@ -846,12 +791,68 @@ CONFIG_FT_FDC_THR=8
 CONFIG_FT_FDC_MAX_RATE=2000
 CONFIG_FT_ALPHA_CLOCK=0
 
+#
+# USB support
+#
+CONFIG_USB=m
+CONFIG_USB_DEBUG=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_HOTPLUG=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_ACM=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_DEBUG=y
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_OV511=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PLUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_BLUETOOTH=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_HID=m
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_WACOM=m
+CONFIG_USB_WMFORCE=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
 #
 # Filesystems
 #
 CONFIG_QUOTA=y
 CONFIG_AUTOFS_FS=m
-# CONFIG_ADFS_FS is not set
+CONFIG_ADFS_FS=m
 CONFIG_AFFS_FS=m
 CONFIG_HFS_FS=m
 CONFIG_FAT_FS=m
@@ -866,14 +867,13 @@ CONFIG_NTFS_FS=m
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
 CONFIG_EFS_FS=m
 CONFIG_SGI_PARTITION=y
 
@@ -885,9 +885,12 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
 CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_NCP_FS=m
 CONFIG_NCPFS_PACKET_SIGNING=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
@@ -965,7 +968,7 @@ CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
 CONFIG_FB_MATROX_G100=y
 CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_ATY128 is not set
+CONFIG_FB_ATY128=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1018,6 +1021,7 @@ CONFIG_SOUND_MSNDPIN=m
 # CONFIG_MSNDPIN_HAVE_BOOT is not set
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_OSS=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_SB=m
@@ -1030,7 +1034,6 @@ CONFIG_SOUND_PSS=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_VIA82CXXX=m
 CONFIG_SOUND_MAD16=m
 CONFIG_MAD16_OLDCARD=y
 CONFIG_SOUND_WAVEFRONT=m