2 files changed, 268 insertions, 14 deletions

diff --git a/Lib/linux2/IN.py b/Lib/linux2/IN.py
index 1f49f01..42c041f 100755
--- a/Lib/linux2/IN.py
+++ b/Lib/linux2/IN.py
@@ -233,39 +233,166 @@ __LITTLE_ENDIAN = 1234
 
 # Included from linux/autoconf.h
 CONFIG_MODULES = 1
+CONFIG_MODVERSIONS = 1
 CONFIG_KERNELD = 1
+CONFIG_MATH_EMULATION = 1
 CONFIG_NET = 1
 CONFIG_PCI = 1
 CONFIG_SYSVIPC = 1
 CONFIG_BINFMT_AOUT = 1
 CONFIG_BINFMT_ELF = 1
 CONFIG_KERNEL_ELF = 1
-CONFIG_M586 = 1
+CONFIG_M386 = 1
 CONFIG_BLK_DEV_FD = 1
 CONFIG_BLK_DEV_IDE = 1
 CONFIG_BLK_DEV_IDECD = 1
+CONFIG_BLK_DEV_IDETAPE = 1
+CONFIG_BLK_DEV_IDE_PCMCIA = 1
+CONFIG_BLK_DEV_CMD640 = 1
+CONFIG_BLK_DEV_CMD640_ENHANCED = 1
+CONFIG_BLK_DEV_RZ1000 = 1
+CONFIG_BLK_DEV_LOOP_MODULE = 1
+CONFIG_BLK_DEV_MD = 1
+CONFIG_MD_LINEAR_MODULE = 1
+CONFIG_MD_STRIPED_MODULE = 1
+CONFIG_BLK_DEV_RAM = 1
+CONFIG_BLK_DEV_INITRD = 1
+CONFIG_FIREWALL = 1
+CONFIG_NET_ALIAS = 1
 CONFIG_INET = 1
+CONFIG_IP_FORWARD = 1
+CONFIG_IP_FIREWALL = 1
+CONFIG_IP_ACCT = 1
+CONFIG_NET_IPIP_MODULE = 1
+CONFIG_IP_ALIAS_MODULE = 1
+CONFIG_INET_RARP_MODULE = 1
 CONFIG_IP_NOSR = 1
 CONFIG_SKB_LARGE = 1
+CONFIG_IPX_MODULE = 1
+CONFIG_ATALK_MODULE = 1
 CONFIG_SCSI = 1
 CONFIG_BLK_DEV_SD = 1
+CONFIG_CHR_DEV_ST_MODULE = 1
 CONFIG_BLK_DEV_SR = 1
-CONFIG_SCSI_AHA152X = 1
+CONFIG_CHR_DEV_SG_MODULE = 1
+CONFIG_SCSI_CONSTANTS = 1
+CONFIG_SCSI_7000FASST_MODULE = 1
+CONFIG_SCSI_AHA152X_MODULE = 1
+CONFIG_SCSI_AHA1542_MODULE = 1
+CONFIG_SCSI_AHA1740_MODULE = 1
+CONFIG_SCSI_AIC7XXX_MODULE = 1
+CONFIG_SCSI_ADVANSYS_MODULE = 1
+CONFIG_SCSI_IN2000_MODULE = 1
+CONFIG_SCSI_AM53C974 = 1
+CONFIG_SCSI_BUSLOGIC_MODULE = 1
+CONFIG_SCSI_DTC3280_MODULE = 1
+CONFIG_SCSI_EATA_DMA_MODULE = 1
+CONFIG_SCSI_EATA_PIO_MODULE = 1
+CONFIG_SCSI_EATA_MODULE = 1
+CONFIG_SCSI_FUTURE_DOMAIN_MODULE = 1
+CONFIG_SCSI_GENERIC_NCR5380_MODULE = 1
+CONFIG_SCSI_G_NCR5380_PORT = 1
+CONFIG_SCSI_NCR53C406A_MODULE = 1
+CONFIG_SCSI_NCR53C7xx_MODULE = 1
+CONFIG_SCSI_NCR53C8XX_MODULE = 1
+CONFIG_SCSI_PPA_MODULE = 1
+CONFIG_SCSI_PAS16_MODULE = 1
+CONFIG_SCSI_QLOGIC_FAS_MODULE = 1
+CONFIG_SCSI_QLOGIC_ISP_MODULE = 1
+CONFIG_SCSI_SEAGATE_MODULE = 1
+CONFIG_SCSI_T128_MODULE = 1
+CONFIG_SCSI_U14_34F_MODULE = 1
+CONFIG_SCSI_ULTRASTOR_MODULE = 1
 CONFIG_NETDEVICES = 1
 CONFIG_DUMMY_MODULE = 1
+CONFIG_EQUALIZER_MODULE = 1
+CONFIG_PLIP_MODULE = 1
+CONFIG_PPP_MODULE = 1
+CONFIG_SLIP_MODULE = 1
+CONFIG_SLIP_COMPRESSED = 1
+CONFIG_SLIP_SMART = 1
 CONFIG_NET_ETHERNET = 1
 CONFIG_NET_VENDOR_3COM = 1
-CONFIG_EL3 = 1
+CONFIG_EL1_MODULE = 1
+CONFIG_EL2_MODULE = 1
+CONFIG_EL3_MODULE = 1
+CONFIG_VORTEX_MODULE = 1
+CONFIG_LANCE = 1
+CONFIG_LANCE32 = 1
+CONFIG_NET_VENDOR_SMC = 1
+CONFIG_WD80x3_MODULE = 1
+CONFIG_ULTRA_MODULE = 1
+CONFIG_SMC9194_MODULE = 1
+CONFIG_NET_ISA = 1
+CONFIG_E2100_MODULE = 1
+CONFIG_DEPCA_MODULE = 1
+CONFIG_EWRK3_MODULE = 1
+CONFIG_EEXPRESS_MODULE = 1
+CONFIG_HPLAN_PLUS_MODULE = 1
+CONFIG_HPLAN_MODULE = 1
+CONFIG_HP100_MODULE = 1
+CONFIG_NE2000_MODULE = 1
+CONFIG_NET_EISA = 1
+CONFIG_APRICOT_MODULE = 1
+CONFIG_DE4X5_MODULE = 1
+CONFIG_DEC_ELCP_MODULE = 1
+CONFIG_DGRS_MODULE = 1
+CONFIG_NET_POCKET = 1
+CONFIG_DE600_MODULE = 1
+CONFIG_DE620_MODULE = 1
+CONFIG_TR = 1
+CONFIG_IBMTR_MODULE = 1
+CONFIG_ARCNET_MODULE = 1
+CONFIG_ARCNET_ETH = 1
+CONFIG_ARCNET_1051 = 1
+CONFIG_ISDN_MODULE = 1
+CONFIG_ISDN_PPP = 1
+CONFIG_ISDN_PPP_VJ = 1
+CONFIG_ISDN_DRV_ICN_MODULE = 1
+CONFIG_ISDN_DRV_PCBIT_MODULE = 1
+CONFIG_ISDN_DRV_TELES_MODULE = 1
+CONFIG_CD_NO_IDESCSI = 1
+CONFIG_AZTCD_MODULE = 1
+CONFIG_GSCD_MODULE = 1
+CONFIG_SBPCD_MODULE = 1
+CONFIG_MCD_MODULE = 1
+CONFIG_MCDX_MODULE = 1
+CONFIG_OPTCD_MODULE = 1
+CONFIG_CM206_MODULE = 1
+CONFIG_SJCD_MODULE = 1
+CONFIG_CDI_INIT = 1
+CONFIG_ISP16_CDI_MODULE = 1
+CONFIG_CDU31A_MODULE = 1
+CONFIG_CDU535_MODULE = 1
+CONFIG_QUOTA = 1
+CONFIG_LOCK_MANDATORY = 1
+CONFIG_MINIX_FS = 1
+CONFIG_EXT_FS_MODULE = 1
 CONFIG_EXT2_FS = 1
-CONFIG_FAT_FS_MODULE = 1
-CONFIG_MSDOS_FS_MODULE = 1
+CONFIG_XIA_FS_MODULE = 1
+CONFIG_FAT_FS = 1
+CONFIG_MSDOS_FS = 1
 CONFIG_VFAT_FS_MODULE = 1
+CONFIG_UMSDOS_FS_MODULE = 1
 CONFIG_PROC_FS = 1
-CONFIG_NFS_FS_MODULE = 1
-CONFIG_ISO9660_FS_MODULE = 1
+CONFIG_NFS_FS = 1
+CONFIG_SMB_FS_MODULE = 1
+CONFIG_NCP_FS_MODULE = 1
+CONFIG_ISO9660_FS = 1
+CONFIG_HPFS_FS_MODULE = 1
+CONFIG_SYSV_FS_MODULE = 1
+CONFIG_UFS_FS_MODULE = 1
 CONFIG_SERIAL = 1
+CONFIG_CYCLADES_MODULE = 1
+CONFIG_RISCOM8_MODULE = 1
+CONFIG_PRINTER_MODULE = 1
 CONFIG_MOUSE = 1
+CONFIG_ATIXL_BUSMOUSE = 1
+CONFIG_BUSMOUSE = 1
+CONFIG_MS_BUSMOUSE = 1
 CONFIG_PSMOUSE = 1
+CONFIG_82C710_MOUSE = 1
+CONFIG_FTAPE_MODULE = 1
 UTS_SYSNAME = "Linux"
 UTS_MACHINE = "unknown"
 UTS_NODENAME = "(none)"
diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py
index 1f49f01..42c041f 100644
--- a/Lib/plat-linux2/IN.py
+++ b/Lib/plat-linux2/IN.py
@@ -233,39 +233,166 @@ __LITTLE_ENDIAN = 1234
 
 # Included from linux/autoconf.h
 CONFIG_MODULES = 1
+CONFIG_MODVERSIONS = 1
 CONFIG_KERNELD = 1
+CONFIG_MATH_EMULATION = 1
 CONFIG_NET = 1
 CONFIG_PCI = 1
 CONFIG_SYSVIPC = 1
 CONFIG_BINFMT_AOUT = 1
 CONFIG_BINFMT_ELF = 1
 CONFIG_KERNEL_ELF = 1
-CONFIG_M586 = 1
+CONFIG_M386 = 1
 CONFIG_BLK_DEV_FD = 1
 CONFIG_BLK_DEV_IDE = 1
 CONFIG_BLK_DEV_IDECD = 1
+CONFIG_BLK_DEV_IDETAPE = 1
+CONFIG_BLK_DEV_IDE_PCMCIA = 1
+CONFIG_BLK_DEV_CMD640 = 1
+CONFIG_BLK_DEV_CMD640_ENHANCED = 1
+CONFIG_BLK_DEV_RZ1000 = 1
+CONFIG_BLK_DEV_LOOP_MODULE = 1
+CONFIG_BLK_DEV_MD = 1
+CONFIG_MD_LINEAR_MODULE = 1
+CONFIG_MD_STRIPED_MODULE = 1
+CONFIG_BLK_DEV_RAM = 1
+CONFIG_BLK_DEV_INITRD = 1
+CONFIG_FIREWALL = 1
+CONFIG_NET_ALIAS = 1
 CONFIG_INET = 1
+CONFIG_IP_FORWARD = 1
+CONFIG_IP_FIREWALL = 1
+CONFIG_IP_ACCT = 1
+CONFIG_NET_IPIP_MODULE = 1
+CONFIG_IP_ALIAS_MODULE = 1
+CONFIG_INET_RARP_MODULE = 1
 CONFIG_IP_NOSR = 1
 CONFIG_SKB_LARGE = 1
+CONFIG_IPX_MODULE = 1
+CONFIG_ATALK_MODULE = 1
 CONFIG_SCSI = 1
 CONFIG_BLK_DEV_SD = 1
+CONFIG_CHR_DEV_ST_MODULE = 1
 CONFIG_BLK_DEV_SR = 1
-CONFIG_SCSI_AHA152X = 1
+CONFIG_CHR_DEV_SG_MODULE = 1
+CONFIG_SCSI_CONSTANTS = 1
+CONFIG_SCSI_7000FASST_MODULE = 1
+CONFIG_SCSI_AHA152X_MODULE = 1
+CONFIG_SCSI_AHA1542_MODULE = 1
+CONFIG_SCSI_AHA1740_MODULE = 1
+CONFIG_SCSI_AIC7XXX_MODULE = 1
+CONFIG_SCSI_ADVANSYS_MODULE = 1
+CONFIG_SCSI_IN2000_MODULE = 1
+CONFIG_SCSI_AM53C974 = 1
+CONFIG_SCSI_BUSLOGIC_MODULE = 1
+CONFIG_SCSI_DTC3280_MODULE = 1
+CONFIG_SCSI_EATA_DMA_MODULE = 1
+CONFIG_SCSI_EATA_PIO_MODULE = 1
+CONFIG_SCSI_EATA_MODULE = 1
+CONFIG_SCSI_FUTURE_DOMAIN_MODULE = 1
+CONFIG_SCSI_GENERIC_NCR5380_MODULE = 1
+CONFIG_SCSI_G_NCR5380_PORT = 1
+CONFIG_SCSI_NCR53C406A_MODULE = 1
+CONFIG_SCSI_NCR53C7xx_MODULE = 1
+CONFIG_SCSI_NCR53C8XX_MODULE = 1
+CONFIG_SCSI_PPA_MODULE = 1
+CONFIG_SCSI_PAS16_MODULE = 1
+CONFIG_SCSI_QLOGIC_FAS_MODULE = 1
+CONFIG_SCSI_QLOGIC_ISP_MODULE = 1
+CONFIG_SCSI_SEAGATE_MODULE = 1
+CONFIG_SCSI_T128_MODULE = 1
+CONFIG_SCSI_U14_34F_MODULE = 1
+CONFIG_SCSI_ULTRASTOR_MODULE = 1
 CONFIG_NETDEVICES = 1
 CONFIG_DUMMY_MODULE = 1
+CONFIG_EQUALIZER_MODULE = 1
+CONFIG_PLIP_MODULE = 1
+CONFIG_PPP_MODULE = 1
+CONFIG_SLIP_MODULE = 1
+CONFIG_SLIP_COMPRESSED = 1
+CONFIG_SLIP_SMART = 1
 CONFIG_NET_ETHERNET = 1
 CONFIG_NET_VENDOR_3COM = 1
-CONFIG_EL3 = 1
+CONFIG_EL1_MODULE = 1
+CONFIG_EL2_MODULE = 1
+CONFIG_EL3_MODULE = 1
+CONFIG_VORTEX_MODULE = 1
+CONFIG_LANCE = 1
+CONFIG_LANCE32 = 1
+CONFIG_NET_VENDOR_SMC = 1
+CONFIG_WD80x3_MODULE = 1
+CONFIG_ULTRA_MODULE = 1
+CONFIG_SMC9194_MODULE = 1
+CONFIG_NET_ISA = 1
+CONFIG_E2100_MODULE = 1
+CONFIG_DEPCA_MODULE = 1
+CONFIG_EWRK3_MODULE = 1
+CONFIG_EEXPRESS_MODULE = 1
+CONFIG_HPLAN_PLUS_MODULE = 1
+CONFIG_HPLAN_MODULE = 1
+CONFIG_HP100_MODULE = 1
+CONFIG_NE2000_MODULE = 1
+CONFIG_NET_EISA = 1
+CONFIG_APRICOT_MODULE = 1
+CONFIG_DE4X5_MODULE = 1
+CONFIG_DEC_ELCP_MODULE = 1
+CONFIG_DGRS_MODULE = 1
+CONFIG_NET_POCKET = 1
+CONFIG_DE600_MODULE = 1
+CONFIG_DE620_MODULE = 1
+CONFIG_TR = 1
+CONFIG_IBMTR_MODULE = 1
+CONFIG_ARCNET_MODULE = 1
+CONFIG_ARCNET_ETH = 1
+CONFIG_ARCNET_1051 = 1
+CONFIG_ISDN_MODULE = 1
+CONFIG_ISDN_PPP = 1
+CONFIG_ISDN_PPP_VJ = 1
+CONFIG_ISDN_DRV_ICN_MODULE = 1
+CONFIG_ISDN_DRV_PCBIT_MODULE = 1
+CONFIG_ISDN_DRV_TELES_MODULE = 1
+CONFIG_CD_NO_IDESCSI = 1
+CONFIG_AZTCD_MODULE = 1
+CONFIG_GSCD_MODULE = 1
+CONFIG_SBPCD_MODULE = 1
+CONFIG_MCD_MODULE = 1
+CONFIG_MCDX_MODULE = 1
+CONFIG_OPTCD_MODULE = 1
+CONFIG_CM206_MODULE = 1
+CONFIG_SJCD_MODULE = 1
+CONFIG_CDI_INIT = 1
+CONFIG_ISP16_CDI_MODULE = 1
+CONFIG_CDU31A_MODULE = 1
+CONFIG_CDU535_MODULE = 1
+CONFIG_QUOTA = 1
+CONFIG_LOCK_MANDATORY = 1
+CONFIG_MINIX_FS = 1
+CONFIG_EXT_FS_MODULE = 1
 CONFIG_EXT2_FS = 1
-CONFIG_FAT_FS_MODULE = 1
-CONFIG_MSDOS_FS_MODULE = 1
+CONFIG_XIA_FS_MODULE = 1
+CONFIG_FAT_FS = 1
+CONFIG_MSDOS_FS = 1
 CONFIG_VFAT_FS_MODULE = 1
+CONFIG_UMSDOS_FS_MODULE = 1
 CONFIG_PROC_FS = 1
-CONFIG_NFS_FS_MODULE = 1
-CONFIG_ISO9660_FS_MODULE = 1
+CONFIG_NFS_FS = 1
+CONFIG_SMB_FS_MODULE = 1
+CONFIG_NCP_FS_MODULE = 1
+CONFIG_ISO9660_FS = 1
+CONFIG_HPFS_FS_MODULE = 1
+CONFIG_SYSV_FS_MODULE = 1
+CONFIG_UFS_FS_MODULE = 1
 CONFIG_SERIAL = 1
+CONFIG_CYCLADES_MODULE = 1
+CONFIG_RISCOM8_MODULE = 1
+CONFIG_PRINTER_MODULE = 1
 CONFIG_MOUSE = 1
+CONFIG_ATIXL_BUSMOUSE = 1
+CONFIG_BUSMOUSE = 1
+CONFIG_MS_BUSMOUSE = 1
 CONFIG_PSMOUSE = 1
+CONFIG_82C710_MOUSE = 1
+CONFIG_FTAPE_MODULE = 1
 UTS_SYSNAME = "Linux"
 UTS_MACHINE = "unknown"
 UTS_NODENAME = "(none)"