- updated to 2.4.13-pre

Changed files:
    kernel-addon.config -> 1.10
    kernel-grsec.config -> 1.12
    kernel-ia32-smp.config -> 1.4
    kernel-ia32.config -> 1.4
    kernel-netfilter.config -> 1.5

diff --git a/kernel-addon.config b/kernel-addon.config
index 42c09d40a08f5540859bd773798114ffc5949d4b..54bc6ba61c178e7619d2d209a1744d43a8bacc9a 100644 (file)
--- a/kernel-addon.config
+++ b/kernel-addon.config
@@ -1,86 +1,21 @@
-CONFIG_AIRO=m
-CONFIG_AIRO_CS=m
-CONFIG_USB_CATC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_BLK_DEV_AMD7409 is not set
-CONFIG_BLK_DEV_OSB4=y
-CONFIG_PCMCIA_NINJA_SCSI=m
-# CONFIG_ARM_AM79C961A is not set
-CONFIG_SUNGEM=m
-CONFIG_TULIP_MWI=y
-CONFIG_TULIP_MMIO=y
-CONFIG_DL2K=m
-CONFIG_ALI_FIR=m
-CONFIG_ISDN_DRV_TPAM=m
-CONFIG_W83877F_WDT=m
-CONFIG_SONYPI=m
-CONFIG_AGP_SWORKS=y
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_MEYE=m
+#
+# misc addons
+#
 CONFIG_JFS_FS=m
 # CONFIG_JFS_DEBUG is not set
 CONFIG_EXT3_FS=m
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_BUFFER_DEBUG is not set
-CONFIG_FB_PVR2=n
-CONFIG_SOUND_CMPCI_FM=y
-CONFIG_SOUND_CMPCI_MIDI=y
-CONFIG_SOUND_CMPCI_MPUIO=330
-CONFIG_SOUND_CMPCI_JOYSTICK=y
-CONFIG_SOUND_CMPCI_CM8738=y
-CONFIG_SOUND_CMPCI_SPDIFINVERSE=y
-CONFIG_SOUND_CMPCI_SPEAKERS=2
-CONFIG_MIDI_VIA82CXXX=y
-CONFIG_USB_SE401=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_FUSION=m
-CONFIG_FUSION_ISENSE=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-CONFIG_IEEE1394_SBP2=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_PAGE_BUF=m
+CONFIG_XFS_FS=m
+CONFIG_HAVE_ATTRCTL=y
+CONFIG_XFS_RT=y
+CONFIG_XFS_QUOTA=y
+# CONFIG_XFS_DMAPI is not set
 
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-CONFIG_BLK_DEV_ATARAID=m
-CONFIG_BLK_DEV_ATARAID_PDC=m
-CONFIG_BLK_DEV_ATARAID_HPT=m
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_NCR_D700=m
-# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
-CONFIG_LP486E=m
-# CONFIG_LAN_SAA9730 is not set
-CONFIG_NS83820=m
-CONFIG_FARSYNC=m
-# CONFIG_SBNI_MULTILINE is not set
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_VLSI_FIR=m
-# CONFIG_HISAX_DEBUG is not set
-CONFIG_HISAX_ST5481=m
-CONFIG_INPUT_GAMEPORT=m
-CONFIG_INPUT_EMU10K1=m
-CONFIG_INPUT_SERIO=m
-CONFIG_RADIO_GEMTEK_PCI=m
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_FB_ATY_GX is not set
-# CONFIG_FB_ATY_CT is not set
-CONFIG_FB_RADEON=m
-# CONFIG_FB_SIS_300 is not set
-# CONFIG_FB_SIS_315 is not set
-CONFIG_FB_VOODOO1=m
-CONFIG_SOUND_BT878=m
-CONFIG_MIDI_EMU10K1=y
-CONFIG_SOUND_RME96XX=m
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-CONFIG_USB_CDCETHER=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_BLUEZ_HCIVHCI=m
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_GRKERNSEC_FORKBOMB is not set
-# CONFIG_GRKERNSEC_SYSCTL is not set
+# CONFIG_KDB is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_KDB_OFF is not set
+# CONFIG_FRAME_POINTER is not set

diff --git a/kernel-grsec.config b/kernel-grsec.config
index 477b856c22c8f400b4719db8dfde82f248caff48..1aeeb10e75067b5957d2d2001b483cf0aea38b29 100644 (file)
--- a/kernel-grsec.config
+++ b/kernel-grsec.config
@@ -1,5 +1,5 @@
 #
-# Getrewted Kernel Security
+# Grsecurity
 #
 CONFIG_GRKERNSEC=y
 
@@ -8,6 +8,7 @@ CONFIG_GRKERNSEC=y
 #
 CONFIG_GRKERNSEC_STACK=y
 CONFIG_GRKERNSEC_STACK_GCC=y
+CONFIG_GRKERNSEC_PAX_RANDMMAP=y
 
 #
 # Access Control Lists
@@ -42,6 +43,7 @@ CONFIG_GRKERNSEC_TIME=y
 # Executable Protections
 #
 CONFIG_GRKERNSEC_EXECVE=y
+CONFIG_GRKERNSEC_RANDPID=y
 CONFIG_GRKERNSEC_FORKBOMB=y
 CONFIG_GRKERNSEC_FORKBOMB_GID=65504
 CONFIG_GRKERNSEC_FORKBOMB_SEC=40
@@ -54,7 +56,6 @@ CONFIG_GRKERNSEC_TPE_GID=65500
 #
 # Network Protections
 #
-CONFIG_GRKERNSEC_RANDPID=y
 CONFIG_GRKERNSEC_RANDID=y
 CONFIG_GRKERNSEC_RANDSRC=y
 CONFIG_GRKERNSEC_RANDPING=y

diff --git a/kernel-ia32-smp.config b/kernel-ia32-smp.config
index 05eea84ae9dc919456cb16ebecdb7a7427a40200..bf1140833761f8633be92b3c3b4b85b70fd02e43 100644 (file)
--- a/kernel-ia32-smp.config
+++ b/kernel-ia32-smp.config
@@ -21,6 +21,34 @@ CONFIG_KMOD=y
 #
 # Processor type and features
 #
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_PGE=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_TOSHIBA=m
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
@@ -28,15 +56,17 @@ CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
+CONFIG_HIGHMEM=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_SMP=y
+# CONFIG_MULTIQUAD is not set
+CONFIG_HAVE_DEC_LOCK=y
 
 #
 # General setup
 #
 CONFIG_NET=y
-# CONFIG_VISWS is not set
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_PCI=y
@@ -83,7 +113,6 @@ CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_PARTITIONS=m
 CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_BOOTLDR_PARTS=m
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -95,19 +124,21 @@ CONFIG_NFTL_RW=y
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=m
-CONFIG_MTD_CFI_VIRTUAL_ER=y
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_NOSWAP=y
 # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
 # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LART_BIT_SWAP is not set
 # CONFIG_MTD_CFI_GEOMETRY is not set
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_AMDSTD=m
-CONFIG_MTD_SHARP=m
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
 # CONFIG_MTD_JEDEC is not set
 
 #
@@ -117,26 +148,15 @@ CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_START=8000000
 CONFIG_MTD_PHYSMAP_LEN=4000000
 CONFIG_MTD_PHYSMAP_BUSWIDTH=2
-# CONFIG_MTD_SUN_UFLASH is not set
-CONFIG_MTD_NORA=m
 CONFIG_MTD_PNC2000=m
-CONFIG_MTD_RPXLITE=m
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_SBC_GXX=m
 CONFIG_MTD_ELAN_104NC=m
-# CONFIG_MTD_SA1100 is not set
-# CONFIG_MTD_SA1100_REDBOOT_PARTITIONS is not set
-# CONFIG_MTD_SA1100_BOOTLDR_PARTITIONS is not set
-# CONFIG_MTD_DC21285 is not set
-CONFIG_MTD_IQ80310=m
-CONFIG_MTD_DBOX2=m
-# CONFIG_MTD_CSTM_MIPS_IXX is not set
-CONFIG_MTD_CFI_FLAGADM=m
 # CONFIG_MTD_MIXMEM is not set
 # CONFIG_MTD_OCTAGON is not set
 # CONFIG_MTD_VMAX is not set
-CONFIG_MTD_OCELOT=m
+# CONFIG_MTD_L440GX is not set
 
 #
 # Self-contained MTD device drivers
@@ -148,6 +168,7 @@ CONFIG_MTD_SLRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLKMTD=m
 CONFIG_MTD_DOC1000=m
 CONFIG_MTD_DOC2000=m
 CONFIG_MTD_DOC2001=m
@@ -163,15 +184,17 @@ CONFIG_MTD_DOCPROBE_55AA=y
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_SPIA is not set
 
 #
 # Parallel port support
 #
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_AMIGA is not set
 # CONFIG_PARPORT_MFC3 is not set
 # CONFIG_PARPORT_ATARI is not set
@@ -205,6 +228,7 @@ CONFIG_DIGEST_SHA1=m
 #
 CONFIG_PNP=m
 CONFIG_ISAPNP=m
+# CONFIG_PNPBIOS is not set
 
 #
 # Block devices
@@ -254,6 +278,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5=m
+CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 
 #
@@ -312,9 +337,11 @@ CONFIG_DECNET_ROUTER=y
 CONFIG_BRIDGE=m
 CONFIG_X25=m
 CONFIG_LAPB=m
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
+CONFIG_LLC=y
+CONFIG_NET_DIVERT=y
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
 CONFIG_WAN_ROUTER=m
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
@@ -362,6 +389,7 @@ CONFIG_IPSEC_DEBUG=y
 #
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
 
 #
 # ATA/IDE/MFM/RLL support
@@ -397,13 +425,12 @@ CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_ADMA=y
 CONFIG_BLK_DEV_OFFBOARD=y
 # CONFIG_IDEDMA_PCI_AUTO is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set
 CONFIG_BLK_DEV_AEC62XX=y
 # CONFIG_AEC62XX_TUNING is not set
 CONFIG_BLK_DEV_ALI15X3=y
@@ -433,6 +460,9 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_DMA_NONPCI is not set
 CONFIG_BLK_DEV_IDE_MODES=y
+CONFIG_BLK_DEV_ATARAID=m
+CONFIG_BLK_DEV_ATARAID_PDC=m
+CONFIG_BLK_DEV_ATARAID_HPT=m
 
 #
 # SCSI support
@@ -469,6 +499,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
 CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT=y
 CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE=128
 CONFIG_AIC7XXX_OLD_PROC_STATS=y
+CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_AM53C974=m
@@ -502,6 +533,8 @@ CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_NCR_D700=m
+CONFIG_53C700_IO_MAPPED=y
 CONFIG_SCSI_NCR53C7xx=m
 # CONFIG_SCSI_NCR53C7xx_sync is not set
 CONFIG_SCSI_NCR53C7xx_FAST=y
@@ -523,6 +556,7 @@ CONFIG_SCSI_PSI240I=m
 CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
+# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_SEAGATE=m
 CONFIG_SCSI_SIM710=m
@@ -542,11 +576,22 @@ CONFIG_SCSI_DEBUG=m
 #
 CONFIG_SCSI_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
 
 #
-# IEEE 1394 (FireWire) support
+# Fusion MPT device support
+#
+CONFIG_FUSION=m
+# CONFIG_FUSION_BOOT is not set
+CONFIG_FUSION_ISENSE=m
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_NET_FC=y
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
@@ -554,6 +599,7 @@ CONFIG_IEEE1394_PCILYNX_LOCALRAM=y
 CONFIG_IEEE1394_PCILYNX_PORTS=y
 CONFIG_IEEE1394_OHCI1394=m
 CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_RAWIO=m
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
 
@@ -608,6 +654,12 @@ CONFIG_NET_SB1000=m
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+CONFIG_HAPPYMEAL=m
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_EL1=m
 CONFIG_EL2=m
@@ -639,6 +691,7 @@ CONFIG_EEXPRESS=m
 CONFIG_EEXPRESS_PRO=m
 CONFIG_HPLAN_PLUS=m
 CONFIG_HPLAN=m
+CONFIG_LP486E=m
 CONFIG_ETH16I=m
 CONFIG_NE2000=m
 CONFIG_SKMC=m
@@ -651,11 +704,12 @@ CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_CS89x0=m
 CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
 CONFIG_DE4X5=m
 CONFIG_DGRS=m
 CONFIG_DM9102=m
 CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PM is not set
 CONFIG_LNE390=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
@@ -672,7 +726,6 @@ CONFIG_SUNDANCE=m
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
 CONFIG_WINBOND_840=m
-CONFIG_HAPPYMEAL=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
@@ -683,6 +736,9 @@ CONFIG_DE620=m
 #
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+# CONFIG_MYRI_SBUS is not set
+CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
@@ -721,7 +777,12 @@ CONFIG_AIRONET4500_PCI=y
 # CONFIG_AIRONET4500_ISA is not set
 # CONFIG_AIRONET4500_I365 is not set
 CONFIG_AIRONET4500_PROC=m
+CONFIG_AIRO=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
 CONFIG_PCMCIA_HERMES=m
+CONFIG_AIRO_CS=m
+CONFIG_NET_WIRELESS=y
 
 #
 # Token Ring devices
@@ -755,6 +816,7 @@ CONFIG_COMX_PROTO_PPP=m
 CONFIG_COMX_PROTO_LAPB=m
 CONFIG_COMX_PROTO_FR=m
 CONFIG_DSCC4=m
+CONFIG_FARSYNC=m
 CONFIG_LANMEDIA=m
 CONFIG_SEALEVEL_4021=m
 CONFIG_SYNCLINK_SYNCPPP=m
@@ -779,6 +841,7 @@ CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
 
 #
 # PCMCIA network device support
@@ -793,6 +856,7 @@ CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_ARCNET_COM20020_CS=m
 CONFIG_PCMCIA_IBMTR=m
+CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_NET_PCMCIA_RADIO=y
 CONFIG_PCMCIA_RAYCS=m
@@ -858,7 +922,16 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
-# CONFIG_SOUNDMODEM is not set
+CONFIG_SOUNDMODEM=m
+CONFIG_SOUNDMODEM_SBC=y
+CONFIG_SOUNDMODEM_WSS=y
+CONFIG_SOUNDMODEM_AFSK1200=y
+CONFIG_SOUNDMODEM_AFSK2400_7=y
+CONFIG_SOUNDMODEM_AFSK2400_8=y
+CONFIG_SOUNDMODEM_AFSK2666=y
+CONFIG_SOUNDMODEM_HAPN4800=y
+CONFIG_SOUNDMODEM_PSK4800=y
+CONFIG_SOUNDMODEM_FSK9600=y
 CONFIG_YAM=m
 
 #
@@ -891,6 +964,8 @@ CONFIG_NSC_FIR=m
 CONFIG_WINBOND_FIR=m
 CONFIG_TOSHIBA_FIR=m
 CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
 
 #
 # ISDN subsystem
@@ -948,8 +1023,10 @@ CONFIG_HISAX_GAZEL=y
 CONFIG_HISAX_HFC_PCI=y
 CONFIG_HISAX_W6692=y
 CONFIG_HISAX_HFC_SX=y
+# CONFIG_HISAX_DEBUG is not set
 CONFIG_HISAX_SEDLBAUER_CS=m
 CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_ST5481=m
 
 #
 # Active ISDN cards
@@ -963,6 +1040,7 @@ CONFIG_ISDN_DRV_EICON_DIVAS=m
 CONFIG_ISDN_DRV_EICON_OLD=m
 CONFIG_ISDN_DRV_EICON_PCI=y
 CONFIG_ISDN_DRV_EICON_ISA=y
+CONFIG_ISDN_DRV_TPAM=m
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
@@ -1036,6 +1114,7 @@ CONFIG_I2C_VELLEMAN=m
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_PROC=m
 
 #
 # Mice
@@ -1052,11 +1131,14 @@ CONFIG_PC110_PAD=m
 #
 # Joysticks
 #
-CONFIG_JOYSTICK=y
+CONFIG_INPUT_GAMEPORT=m
 CONFIG_INPUT_NS558=m
 CONFIG_INPUT_LIGHTNING=m
 CONFIG_INPUT_PCIGAME=m
 CONFIG_INPUT_CS461X=m
+CONFIG_INPUT_EMU10K1=m
+CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERPORT=m
 CONFIG_INPUT_ANALOG=m
 CONFIG_INPUT_A3D=m
 CONFIG_INPUT_ADI=m
@@ -1066,14 +1148,13 @@ CONFIG_INPUT_GRIP=m
 CONFIG_INPUT_INTERACT=m
 CONFIG_INPUT_TMDC=m
 CONFIG_INPUT_SIDEWINDER=m
-CONFIG_INPUT_SERPORT=m
+CONFIG_INPUT_IFORCE_USB=m
+CONFIG_INPUT_IFORCE_232=m
 CONFIG_INPUT_WARRIOR=m
 CONFIG_INPUT_MAGELLAN=m
 CONFIG_INPUT_SPACEORB=m
 CONFIG_INPUT_SPACEBALL=m
 CONFIG_INPUT_STINGER=m
-CONFIG_INPUT_IFORCE_232=m
-CONFIG_INPUT_IFORCE_USB=m
 CONFIG_INPUT_DB9=m
 CONFIG_INPUT_GAMECON=m
 CONFIG_INPUT_TURBOGRAFX=m
@@ -1093,7 +1174,9 @@ CONFIG_WDT_501=y
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
+CONFIG_IB700_WDT=m
 CONFIG_60XX_WDT=m
+CONFIG_W83877F_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_I810_TCO=m
 CONFIG_MACHZ_WDT=m
@@ -1103,6 +1186,7 @@ CONFIG_RTC=m
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
 
 #
 # Ftape, the floppy tape device driver
@@ -1131,6 +1215,7 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_AGP_SWORKS=y
 CONFIG_DRM=y
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_GAMMA=m
@@ -1143,6 +1228,7 @@ CONFIG_DRM_MGA=m
 # PCMCIA character devices
 #
 CONFIG_PCMCIA_SERIAL_CS=m
+CONFIG_MWAVE=m
 
 #
 # Multimedia devices
@@ -1158,15 +1244,16 @@ CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_TUNER_3036=m
 CONFIG_VIDEO_STRADIS=m
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_BUZ is not set
+CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZR36120=m
+CONFIG_VIDEO_MEYE=m
 
 #
 # Radio Adapters
@@ -1176,6 +1263,7 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_MIROPCM20=m
@@ -1207,6 +1295,9 @@ CONFIG_VFAT_FS=m
 CONFIG_EFS_FS=m
 CONFIG_JFFS_FS=m
 CONFIG_JFFS_FS_VERBOSE=0
+CONFIG_JFFS_PROC_FS=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_CRAMFS=m
 CONFIG_TMPFS=y
 CONFIG_RAMFS=m
@@ -1228,7 +1319,6 @@ CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
-CONFIG_SYSV_FS_WRITE=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
 CONFIG_UFS_FS=m
@@ -1258,6 +1348,8 @@ CONFIG_NCPFS_OS2_NS=y
 CONFIG_NCPFS_SMALLDOS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_EXTRAS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_ZLIB_FS_INFLATE=m
 
 #
 # Partition Types
@@ -1277,6 +1369,8 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
@@ -1286,7 +1380,7 @@ CONFIG_NLS=y
 #
 # Native Language Support
 #
-CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
@@ -1346,7 +1440,6 @@ CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
 CONFIG_FB_HGA=m
 CONFIG_VIDEO_SELECT=y
-# CONFIG_FB_E1355 is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1356,9 +1449,15 @@ CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_G450=m
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_ATY=m
+# CONFIG_FB_ATY_GX is not set
+# CONFIG_FB_ATY_CT is not set
+CONFIG_FB_RADEON=m
 CONFIG_FB_ATY128=m
-CONFIG_FB_3DFX=m
 CONFIG_FB_SIS=m
+# CONFIG_FB_SIS_300 is not set
+# CONFIG_FB_SIS_315 is not set
+CONFIG_FB_3DFX=m
+CONFIG_FB_VOODOO1=m
 CONFIG_FB_VIRTUAL=m
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1391,10 +1490,20 @@ CONFIG_FONT_8x16=y
 # Sound
 #
 CONFIG_SOUND=m
+CONFIG_SOUND_BT878=m
 CONFIG_SOUND_CMPCI=m
+CONFIG_SOUND_CMPCI_FM=y
+CONFIG_SOUND_CMPCI_FMIO=388
+CONFIG_SOUND_CMPCI_FMIO=388
+CONFIG_SOUND_CMPCI_MIDI=y
+CONFIG_SOUND_CMPCI_MPUIO=330
+CONFIG_SOUND_CMPCI_JOYSTICK=y
+CONFIG_SOUND_CMPCI_CM8738=y
+CONFIG_SOUND_CMPCI_SPDIFINVERSE=y
 # CONFIG_SOUND_CMPCI_SPDIFLOOP is not set
-# CONFIG_SOUND_CMPCI_4CH is not set
+CONFIG_SOUND_CMPCI_SPEAKERS=2
 CONFIG_SOUND_EMU10K1=m
+CONFIG_MIDI_EMU10K1=y
 CONFIG_SOUND_FUSION=m
 CONFIG_SOUND_CS4281=m
 CONFIG_SOUND_ES1370=m
@@ -1403,6 +1512,7 @@ CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_MAESTRO=m
 CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ICH=m
+CONFIG_SOUND_RME96XX=m
 CONFIG_SOUND_SONICVIBES=m
 CONFIG_SOUND_TRIDENT=m
 CONFIG_SOUND_MSNDCLAS=m
@@ -1414,6 +1524,7 @@ CONFIG_SOUND_MSNDPIN=m
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
 CONFIG_SOUND_VIA82CXXX=m
+CONFIG_MIDI_VIA82CXXX=y
 CONFIG_SOUND_OSS=m
 # CONFIG_SOUND_TRACEINIT is not set
 # CONFIG_SOUND_DMAP is not set
@@ -1464,6 +1575,8 @@ CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_LONG_TIMEOUT=y
+CONFIG_USB_LARGE_CONFIG=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
@@ -1471,11 +1584,17 @@ CONFIG_USB_AUDIO=m
 CONFIG_USB_BLUETOOTH=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
-# CONFIG_USB_STORAGE_FREECOM is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
 CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_HP8200e=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_HID=m
+CONFIG_USB_HIDDEV=y
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
 CONFIG_USB_WACOM=m
@@ -1483,14 +1602,18 @@ CONFIG_USB_DC2XX=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_SCANNER=m
 CONFIG_USB_MICROTEK=m
+CONFIG_USB_HPUSBSCSI=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_OV511=m
 CONFIG_USB_PWC=m
+CONFIG_USB_SE401=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
 CONFIG_USB_PEGASUS=m
-CONFIG_USB_NET1080=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_CATC=m
+CONFIG_USB_CDCETHER=m
+CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
 
 #
@@ -1504,16 +1627,22 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=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_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_RIO500=m
 
@@ -1528,9 +1657,10 @@ CONFIG_BLUEZ_L2CAP=m
 #
 CONFIG_BLUEZ_HCIUSB=m
 CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIEMU=m
+CONFIG_BLUEZ_HCIVHCI=m
 
 #
 # Kernel hacking
 #
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_KERNEL is not set
+

diff --git a/kernel-ia32.config b/kernel-ia32.config
index 439b8722eadcb0c63417ebbbb5a699e62efa6862..04aeaecc3cd6c4da158cbde4b613e2e4b91ab4da 100644 (file)
--- a/kernel-ia32.config
+++ b/kernel-ia32.config
@@ -21,6 +21,34 @@ CONFIG_KMOD=y
 #
 # Processor type and features
 #
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_PGE=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_TOSHIBA=m
 CONFIG_MICROCODE=m
 CONFIG_X86_MSR=m
@@ -28,16 +56,17 @@ CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
+CONFIG_HIGHMEM=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 # CONFIG_SMP is not set
+# CONFIG_X86_UP_APIC is not set
 # CONFIG_X86_UP_IOAPIC is not set
 
 #
 # General setup
 #
 CONFIG_NET=y
-# CONFIG_VISWS is not set
 CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GODIRECT is not set
@@ -82,7 +111,6 @@ CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_PARTITIONS=m
 CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_BOOTLDR_PARTS=m
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -94,19 +122,21 @@ CONFIG_NFTL_RW=y
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=m
-CONFIG_MTD_CFI_VIRTUAL_ER=y
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_NOSWAP=y
 # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
 # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LART_BIT_SWAP is not set
 # CONFIG_MTD_CFI_GEOMETRY is not set
 CONFIG_MTD_CFI_INTELEXT=m
 CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_AMDSTD=m
-CONFIG_MTD_SHARP=m
 CONFIG_MTD_RAM=m
 CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
 # CONFIG_MTD_JEDEC is not set
 
 #
@@ -116,26 +146,15 @@ CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_START=8000000
 CONFIG_MTD_PHYSMAP_LEN=4000000
 CONFIG_MTD_PHYSMAP_BUSWIDTH=2
-# CONFIG_MTD_SUN_UFLASH is not set
-CONFIG_MTD_NORA=m
 CONFIG_MTD_PNC2000=m
-CONFIG_MTD_RPXLITE=m
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_SBC_GXX=m
 CONFIG_MTD_ELAN_104NC=m
-# CONFIG_MTD_SA1100 is not set
-# CONFIG_MTD_SA1100_REDBOOT_PARTITIONS is not set
-# CONFIG_MTD_SA1100_BOOTLDR_PARTITIONS is not set
-# CONFIG_MTD_DC21285 is not set
-CONFIG_MTD_IQ80310=m
-CONFIG_MTD_DBOX2=m
-# CONFIG_MTD_CSTM_MIPS_IXX is not set
-CONFIG_MTD_CFI_FLAGADM=m
 # CONFIG_MTD_MIXMEM is not set
 # CONFIG_MTD_OCTAGON is not set
 # CONFIG_MTD_VMAX is not set
-CONFIG_MTD_OCELOT=m
+# CONFIG_MTD_L440GX is not set
 
 #
 # Self-contained MTD device drivers
@@ -147,6 +166,7 @@ CONFIG_MTD_SLRAM=m
 CONFIG_MTD_MTDRAM=m
 CONFIG_MTDRAM_TOTAL_SIZE=4096
 CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLKMTD=m
 CONFIG_MTD_DOC1000=m
 CONFIG_MTD_DOC2000=m
 CONFIG_MTD_DOC2001=m
@@ -162,15 +182,17 @@ CONFIG_MTD_DOCPROBE_55AA=y
 CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_NAND_SPIA is not set
 
 #
 # Parallel port support
 #
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+CONFIG_PARPORT_SERIAL=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_AMIGA is not set
 # CONFIG_PARPORT_MFC3 is not set
 # CONFIG_PARPORT_ATARI is not set
@@ -204,6 +226,7 @@ CONFIG_DIGEST_SHA1=m
 #
 CONFIG_PNP=m
 CONFIG_ISAPNP=m
+# CONFIG_PNPBIOS is not set
 
 #
 # Block devices
@@ -253,6 +276,7 @@ CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID5=m
+CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 
 #
@@ -311,9 +335,11 @@ CONFIG_DECNET_ROUTER=y
 CONFIG_BRIDGE=m
 CONFIG_X25=m
 CONFIG_LAPB=m
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
+CONFIG_LLC=y
+CONFIG_NET_DIVERT=y
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
 CONFIG_WAN_ROUTER=m
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
@@ -361,6 +387,7 @@ CONFIG_IPSEC_DEBUG=y
 #
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
 
 #
 # ATA/IDE/MFM/RLL support
@@ -396,13 +423,12 @@ CONFIG_BLK_DEV_RZ1000=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_ADMA=y
 CONFIG_BLK_DEV_OFFBOARD=y
 # CONFIG_IDEDMA_PCI_AUTO is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_PCI_WIP is not set
 # CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set
 CONFIG_BLK_DEV_AEC62XX=y
 # CONFIG_AEC62XX_TUNING is not set
 CONFIG_BLK_DEV_ALI15X3=y
@@ -432,6 +458,9 @@ CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_DMA_NONPCI is not set
 CONFIG_BLK_DEV_IDE_MODES=y
+CONFIG_BLK_DEV_ATARAID=m
+CONFIG_BLK_DEV_ATARAID_PDC=m
+CONFIG_BLK_DEV_ATARAID_HPT=m
 
 #
 # SCSI support
@@ -468,6 +497,7 @@ CONFIG_SCSI_AIC7XXX_OLD=m
 CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT=y
 CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE=128
 CONFIG_AIC7XXX_OLD_PROC_STATS=y
+CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_AM53C974=m
@@ -501,6 +531,8 @@ CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_NCR_D700=m
+CONFIG_53C700_IO_MAPPED=y
 CONFIG_SCSI_NCR53C7xx=m
 # CONFIG_SCSI_NCR53C7xx_sync is not set
 CONFIG_SCSI_NCR53C7xx_FAST=y
@@ -522,6 +554,7 @@ CONFIG_SCSI_PSI240I=m
 CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_ISP=m
 CONFIG_SCSI_QLOGIC_FC=m
+# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_SEAGATE=m
 CONFIG_SCSI_SIM710=m
@@ -541,11 +574,22 @@ CONFIG_SCSI_DEBUG=m
 #
 CONFIG_SCSI_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
 
 #
-# IEEE 1394 (FireWire) support
+# Fusion MPT device support
+#
+CONFIG_FUSION=m
+# CONFIG_FUSION_BOOT is not set
+CONFIG_FUSION_ISENSE=m
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_NET_FC=y
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
 #
 CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
@@ -553,6 +597,7 @@ CONFIG_IEEE1394_PCILYNX_LOCALRAM=y
 CONFIG_IEEE1394_PCILYNX_PORTS=y
 CONFIG_IEEE1394_OHCI1394=m
 CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
 CONFIG_IEEE1394_RAWIO=m
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
 
@@ -607,6 +652,12 @@ CONFIG_NET_SB1000=m
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+CONFIG_HAPPYMEAL=m
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+# CONFIG_SUNLANCE is not set
+CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_EL1=m
 CONFIG_EL2=m
@@ -638,6 +689,7 @@ CONFIG_EEXPRESS=m
 CONFIG_EEXPRESS_PRO=m
 CONFIG_HPLAN_PLUS=m
 CONFIG_HPLAN=m
+CONFIG_LP486E=m
 CONFIG_ETH16I=m
 CONFIG_NE2000=m
 CONFIG_SKMC=m
@@ -650,11 +702,12 @@ CONFIG_AC3200=m
 CONFIG_APRICOT=m
 CONFIG_CS89x0=m
 CONFIG_TULIP=m
+CONFIG_TULIP_MWI=y
+CONFIG_TULIP_MMIO=y
 CONFIG_DE4X5=m
 CONFIG_DGRS=m
 CONFIG_DM9102=m
 CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PM is not set
 CONFIG_LNE390=m
 CONFIG_FEALNX=m
 CONFIG_NATSEMI=m
@@ -671,7 +724,6 @@ CONFIG_SUNDANCE=m
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
 CONFIG_WINBOND_840=m
-CONFIG_HAPPYMEAL=m
 CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
@@ -682,6 +734,9 @@ CONFIG_DE620=m
 #
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+# CONFIG_MYRI_SBUS is not set
+CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_SK98LIN=m
@@ -720,7 +775,12 @@ CONFIG_AIRONET4500_PCI=y
 # CONFIG_AIRONET4500_ISA is not set
 # CONFIG_AIRONET4500_I365 is not set
 CONFIG_AIRONET4500_PROC=m
+CONFIG_AIRO=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
 CONFIG_PCMCIA_HERMES=m
+CONFIG_AIRO_CS=m
+CONFIG_NET_WIRELESS=y
 
 #
 # Token Ring devices
@@ -754,6 +814,7 @@ CONFIG_COMX_PROTO_PPP=m
 CONFIG_COMX_PROTO_LAPB=m
 CONFIG_COMX_PROTO_FR=m
 CONFIG_DSCC4=m
+CONFIG_FARSYNC=m
 CONFIG_LANMEDIA=m
 CONFIG_SEALEVEL_4021=m
 CONFIG_SYNCLINK_SYNCPPP=m
@@ -778,6 +839,7 @@ CONFIG_CYCLOMX_X25=y
 CONFIG_LAPBETHER=m
 CONFIG_X25_ASY=m
 CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
 
 #
 # PCMCIA network device support
@@ -792,6 +854,7 @@ CONFIG_PCMCIA_SMC91C92=m
 CONFIG_PCMCIA_XIRC2PS=m
 CONFIG_ARCNET_COM20020_CS=m
 CONFIG_PCMCIA_IBMTR=m
+CONFIG_PCMCIA_XIRCOM=m
 CONFIG_PCMCIA_XIRTULIP=m
 CONFIG_NET_PCMCIA_RADIO=y
 CONFIG_PCMCIA_RAYCS=m
@@ -857,7 +920,16 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
-# CONFIG_SOUNDMODEM is not set
+CONFIG_SOUNDMODEM=m
+CONFIG_SOUNDMODEM_SBC=y
+CONFIG_SOUNDMODEM_WSS=y
+CONFIG_SOUNDMODEM_AFSK1200=y
+CONFIG_SOUNDMODEM_AFSK2400_7=y
+CONFIG_SOUNDMODEM_AFSK2400_8=y
+CONFIG_SOUNDMODEM_AFSK2666=y
+CONFIG_SOUNDMODEM_HAPN4800=y
+CONFIG_SOUNDMODEM_PSK4800=y
+CONFIG_SOUNDMODEM_FSK9600=y
 CONFIG_YAM=m
 
 #
@@ -890,6 +962,8 @@ CONFIG_NSC_FIR=m
 CONFIG_WINBOND_FIR=m
 CONFIG_TOSHIBA_FIR=m
 CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
 
 #
 # ISDN subsystem
@@ -947,8 +1021,10 @@ CONFIG_HISAX_GAZEL=y
 CONFIG_HISAX_HFC_PCI=y
 CONFIG_HISAX_W6692=y
 CONFIG_HISAX_HFC_SX=y
+# CONFIG_HISAX_DEBUG is not set
 CONFIG_HISAX_SEDLBAUER_CS=m
 CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_ST5481=m
 
 #
 # Active ISDN cards
@@ -962,6 +1038,7 @@ CONFIG_ISDN_DRV_EICON_DIVAS=m
 CONFIG_ISDN_DRV_EICON_OLD=m
 CONFIG_ISDN_DRV_EICON_PCI=y
 CONFIG_ISDN_DRV_EICON_ISA=y
+CONFIG_ISDN_DRV_TPAM=m
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
@@ -1035,6 +1112,7 @@ CONFIG_I2C_VELLEMAN=m
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_PROC=m
 
 #
 # Mice
@@ -1051,11 +1129,14 @@ CONFIG_PC110_PAD=m
 #
 # Joysticks
 #
-CONFIG_JOYSTICK=y
+CONFIG_INPUT_GAMEPORT=m
 CONFIG_INPUT_NS558=m
 CONFIG_INPUT_LIGHTNING=m
 CONFIG_INPUT_PCIGAME=m
 CONFIG_INPUT_CS461X=m
+CONFIG_INPUT_EMU10K1=m
+CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERPORT=m
 CONFIG_INPUT_ANALOG=m
 CONFIG_INPUT_A3D=m
 CONFIG_INPUT_ADI=m
@@ -1065,14 +1146,13 @@ CONFIG_INPUT_GRIP=m
 CONFIG_INPUT_INTERACT=m
 CONFIG_INPUT_TMDC=m
 CONFIG_INPUT_SIDEWINDER=m
-CONFIG_INPUT_SERPORT=m
+CONFIG_INPUT_IFORCE_USB=m
+CONFIG_INPUT_IFORCE_232=m
 CONFIG_INPUT_WARRIOR=m
 CONFIG_INPUT_MAGELLAN=m
 CONFIG_INPUT_SPACEORB=m
 CONFIG_INPUT_SPACEBALL=m
 CONFIG_INPUT_STINGER=m
-CONFIG_INPUT_IFORCE_232=m
-CONFIG_INPUT_IFORCE_USB=m
 CONFIG_INPUT_DB9=m
 CONFIG_INPUT_GAMECON=m
 CONFIG_INPUT_TURBOGRAFX=m
@@ -1092,7 +1172,9 @@ CONFIG_WDT_501=y
 CONFIG_PCWATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
+CONFIG_IB700_WDT=m
 CONFIG_60XX_WDT=m
+CONFIG_W83877F_WDT=m
 CONFIG_MIXCOMWD=m
 CONFIG_I810_TCO=m
 CONFIG_MACHZ_WDT=m
@@ -1102,6 +1184,7 @@ CONFIG_RTC=m
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
 
 #
 # Ftape, the floppy tape device driver
@@ -1130,6 +1213,7 @@ CONFIG_AGP_VIA=y
 CONFIG_AGP_AMD=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
+CONFIG_AGP_SWORKS=y
 CONFIG_DRM=y
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_GAMMA=m
@@ -1142,6 +1226,7 @@ CONFIG_DRM_MGA=m
 # PCMCIA character devices
 #
 CONFIG_PCMCIA_SERIAL_CS=m
+CONFIG_MWAVE=m
 
 #
 # Multimedia devices
@@ -1157,15 +1242,16 @@ CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_PMS=m
 CONFIG_VIDEO_BWQCAM=m
 CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
 CONFIG_VIDEO_CPIA=m
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_TUNER_3036=m
 CONFIG_VIDEO_STRADIS=m
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_BUZ is not set
+CONFIG_VIDEO_ZORAN=m
 CONFIG_VIDEO_ZR36120=m
+CONFIG_VIDEO_MEYE=m
 
 #
 # Radio Adapters
@@ -1175,6 +1261,7 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_MIROPCM20=m
@@ -1206,6 +1293,9 @@ CONFIG_VFAT_FS=m
 CONFIG_EFS_FS=m
 CONFIG_JFFS_FS=m
 CONFIG_JFFS_FS_VERBOSE=0
+CONFIG_JFFS_PROC_FS=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_CRAMFS=m
 CONFIG_TMPFS=y
 CONFIG_RAMFS=m
@@ -1227,7 +1317,6 @@ CONFIG_QNX4FS_RW=y
 CONFIG_ROMFS_FS=y
 CONFIG_EXT2_FS=m
 CONFIG_SYSV_FS=m
-CONFIG_SYSV_FS_WRITE=y
 CONFIG_UDF_FS=m
 CONFIG_UDF_RW=y
 CONFIG_UFS_FS=m
@@ -1257,6 +1346,8 @@ CONFIG_NCPFS_OS2_NS=y
 CONFIG_NCPFS_SMALLDOS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_EXTRAS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_ZLIB_FS_INFLATE=m
 
 #
 # Partition Types
@@ -1276,6 +1367,8 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_SOLARIS_X86_PARTITION=y
 CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
 CONFIG_SGI_PARTITION=y
 CONFIG_ULTRIX_PARTITION=y
 CONFIG_SUN_PARTITION=y
@@ -1285,7 +1378,7 @@ CONFIG_NLS=y
 #
 # Native Language Support
 #
-CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
@@ -1345,7 +1438,6 @@ CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
 CONFIG_FB_HGA=m
 CONFIG_VIDEO_SELECT=y
-# CONFIG_FB_E1355 is not set
 CONFIG_FB_MATROX=m
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -1355,9 +1447,15 @@ CONFIG_FB_MATROX_MAVEN=m
 CONFIG_FB_MATROX_G450=m
 CONFIG_FB_MATROX_MULTIHEAD=y
 CONFIG_FB_ATY=m
+# CONFIG_FB_ATY_GX is not set
+# CONFIG_FB_ATY_CT is not set
+CONFIG_FB_RADEON=m
 CONFIG_FB_ATY128=m
-CONFIG_FB_3DFX=m
 CONFIG_FB_SIS=m
+# CONFIG_FB_SIS_300 is not set
+# CONFIG_FB_SIS_315 is not set
+CONFIG_FB_3DFX=m
+CONFIG_FB_VOODOO1=m
 CONFIG_FB_VIRTUAL=m
 CONFIG_FBCON_ADVANCED=y
 CONFIG_FBCON_MFB=m
@@ -1390,10 +1488,20 @@ CONFIG_FONT_8x16=y
 # Sound
 #
 CONFIG_SOUND=m
+CONFIG_SOUND_BT878=m
 CONFIG_SOUND_CMPCI=m
+CONFIG_SOUND_CMPCI_FM=y
+CONFIG_SOUND_CMPCI_FMIO=388
+CONFIG_SOUND_CMPCI_FMIO=388
+CONFIG_SOUND_CMPCI_MIDI=y
+CONFIG_SOUND_CMPCI_MPUIO=330
+CONFIG_SOUND_CMPCI_JOYSTICK=y
+CONFIG_SOUND_CMPCI_CM8738=y
+CONFIG_SOUND_CMPCI_SPDIFINVERSE=y
 # CONFIG_SOUND_CMPCI_SPDIFLOOP is not set
-# CONFIG_SOUND_CMPCI_4CH is not set
+CONFIG_SOUND_CMPCI_SPEAKERS=2
 CONFIG_SOUND_EMU10K1=m
+CONFIG_MIDI_EMU10K1=y
 CONFIG_SOUND_FUSION=m
 CONFIG_SOUND_CS4281=m
 CONFIG_SOUND_ES1370=m
@@ -1402,6 +1510,7 @@ CONFIG_SOUND_ESSSOLO1=m
 CONFIG_SOUND_MAESTRO=m
 CONFIG_SOUND_MAESTRO3=m
 CONFIG_SOUND_ICH=m
+CONFIG_SOUND_RME96XX=m
 CONFIG_SOUND_SONICVIBES=m
 CONFIG_SOUND_TRIDENT=m
 CONFIG_SOUND_MSNDCLAS=m
@@ -1413,6 +1522,7 @@ CONFIG_SOUND_MSNDPIN=m
 CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
 CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
 CONFIG_SOUND_VIA82CXXX=m
+CONFIG_MIDI_VIA82CXXX=y
 CONFIG_SOUND_OSS=m
 # CONFIG_SOUND_TRACEINIT is not set
 # CONFIG_SOUND_DMAP is not set
@@ -1463,6 +1573,8 @@ CONFIG_USB=m
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_LONG_TIMEOUT=y
+CONFIG_USB_LARGE_CONFIG=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
@@ -1470,11 +1582,17 @@ CONFIG_USB_AUDIO=m
 CONFIG_USB_BLUETOOTH=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
-# CONFIG_USB_STORAGE_FREECOM is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
 CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_HP8200e=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_HID=m
+CONFIG_USB_HIDDEV=y
 CONFIG_USB_KBD=m
 CONFIG_USB_MOUSE=m
 CONFIG_USB_WACOM=m
@@ -1482,14 +1600,18 @@ CONFIG_USB_DC2XX=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_SCANNER=m
 CONFIG_USB_MICROTEK=m
+CONFIG_USB_HPUSBSCSI=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_OV511=m
 CONFIG_USB_PWC=m
+CONFIG_USB_SE401=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_DABUSB=m
-CONFIG_USB_PLUSB=m
 CONFIG_USB_PEGASUS=m
-CONFIG_USB_NET1080=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_CATC=m
+CONFIG_USB_CDCETHER=m
+CONFIG_USB_USBNET=m
 CONFIG_USB_USS720=m
 
 #
@@ -1503,16 +1625,22 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=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_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19=y
 CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
 CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
 CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_RIO500=m
 
@@ -1527,9 +1655,10 @@ CONFIG_BLUEZ_L2CAP=m
 #
 CONFIG_BLUEZ_HCIUSB=m
 CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIEMU=m
+CONFIG_BLUEZ_HCIVHCI=m
 
 #
 # Kernel hacking
 #
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_KERNEL is not set
+

diff --git a/kernel-netfilter.config b/kernel-netfilter.config
index 49a2932e9e6857e71d47e83a95e9377c418c9860..0852b2dabf3b7487c23b541196474f16b7c924f2 100644 (file)
--- a/kernel-netfilter.config
+++ b/kernel-netfilter.config
@@ -3,7 +3,6 @@
 #
 CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_TALK=m
 CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_EGG=m
 CONFIG_IP_NF_QUEUE=m
@@ -20,18 +19,18 @@ CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_TIME=m
 CONFIG_IP_NF_MATCH_PSD=m
+CONFIG_IP_NF_MATCH_NTH=m
 CONFIG_IP_NF_MATCH_LENGTH=m
 CONFIG_IP_NF_MATCH_IPV4OPTIONS=m
 CONFIG_IP_NF_MATCH_AH_ESP=m
 CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_STATE=m
 CONFIG_IP_NF_MATCH_RPC=m
 CONFIG_IP_NF_MATCH_IPLIMIT=m
 CONFIG_IP_NF_MATCH_UNCLEAN=m
 CONFIG_IP_NF_MATCH_STRING=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_NTH=m
-CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_NETLINK=m
@@ -40,12 +39,10 @@ CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_NAT_TALK=m
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_BALANCE=m
 CONFIG_IP_NF_NAT_FTP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
@@ -53,9 +50,9 @@ CONFIG_IP_NF_TARGET_FTOS=m
 CONFIG_IP_NF_TARGET_MARK=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_PRESTATE=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_PERS=m
 CONFIG_IP_NF_COMPAT_IPCHAINS=m
 CONFIG_IP_NF_NAT_NEEDED=y
 CONFIG_IP_NF_COMPAT_IPFWADM=m
@@ -70,8 +67,8 @@ CONFIG_IP6_NF_MATCH_MAC=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=m
 CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_AGR=m
 CONFIG_IP6_NF_MATCH_LENGTH=m
+CONFIG_IP6_NF_MATCH_AGR=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_LOG=m