Menu
▾
▴
[IPCop-cvs] CVS: ipcop/config/kernel kernel.config,1.2.2.3,1.2.2.4
|
From: Mark W. <ri...@us...> - 2002-11-30 16:36:02
|
Update of /cvsroot/ipcop/ipcop/config/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv3232a/config/kernel
Modified Files:
Tag: IPCOP_v1
kernel.config
Log Message:
- Updated version to 1.3alpha2
- Fixed modules.tgz size
- Updated to kernel 2.4.20
- Added h323 masquerading module and pptp module
Index: kernel.config
===================================================================
RCS file: /cvsroot/ipcop/ipcop/config/kernel/kernel.config,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** kernel.config 22 Nov 2002 20:17:29 -0000 1.2.2.3
--- kernel.config 30 Nov 2002 16:35:58 -0000 1.2.2.4
***************
*** 1,7 ****
#
! # Automatically generated make config: don't edit
#
CONFIG_X86=y
- CONFIG_ISA=y
# CONFIG_SBUS is not set
CONFIG_UID16=y
--- 1,6 ----
#
! # Automatically generated by make menuconfig: don't edit
#
CONFIG_X86=y
# CONFIG_SBUS is not set
CONFIG_UID16=y
***************
*** 44,47 ****
--- 43,47 ----
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_X86_PPRO_FENCE=y
+ # CONFIG_X86_F00F_WORKS_OK is not set
CONFIG_X86_MCE=y
# CONFIG_TOSHIBA is not set
***************
*** 53,56 ****
--- 53,57 ----
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
+ # CONFIG_HIGHMEM is not set
CONFIG_MATH_EMULATION=y
# CONFIG_MTRR is not set
***************
*** 58,61 ****
--- 59,63 ----
# CONFIG_X86_UP_APIC is not set
# CONFIG_X86_UP_IOAPIC is not set
+ # CONFIG_X86_TSC_DISABLE is not set
#
***************
*** 69,72 ****
--- 71,75 ----
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
+ CONFIG_ISA=y
CONFIG_PCI_NAMES=y
# CONFIG_EISA is not set
***************
*** 126,129 ****
--- 129,133 ----
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_INITRD=y
+ # CONFIG_BLK_STATS is not set
#
***************
*** 171,204 ****
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_PPTP=m
- # CONFIG_IP_NF_PPTP_DEBUG is not set
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
! # CONFIG_IP_NF_MATCH_QUOTA is not set
! # CONFIG_IP_NF_POOL is not set
CONFIG_IP_NF_MATCH_MAC=m
! # CONFIG_IP_NF_MATCH_PKTTYPE is not set
# CONFIG_IP_NF_MATCH_MARK is not set
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_MPORT=m
CONFIG_IP_NF_MATCH_TOS=m
! # CONFIG_IP_NF_MATCH_TIME is not set
! # CONFIG_IP_NF_MATCH_RANDOM is not set
! # CONFIG_IP_NF_MATCH_PSD is not set
! # CONFIG_IP_NF_MATCH_NTH is not set
! # CONFIG_IP_NF_MATCH_IPV4OPTIONS is not set
! # CONFIG_IP_NF_MATCH_ECN is not set
! # CONFIG_IP_NF_MATCH_DSCP is not set
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
! # CONFIG_IP_NF_MATCH_REALM is not set
! # CONFIG_IP_NF_MATCH_HELPER is not set
CONFIG_IP_NF_MATCH_STATE=m
! # CONFIG_IP_NF_MATCH_IPLIMIT is not set
! # CONFIG_IP_NF_MATCH_CONNTRACK is not set
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
--- 175,210 ----
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_FTP=m
+ CONFIG_IP_NF_H323=m
CONFIG_IP_NF_IRC=m
+ CONFIG_IP_NF_CT_PROTO_GRE=m
CONFIG_IP_NF_PPTP=m
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
! CONFIG_IP_NF_MATCH_QUOTA=m
! CONFIG_IP_NF_POOL=m
! # CONFIG_IP_POOL_STATISTICS is not set
CONFIG_IP_NF_MATCH_MAC=m
! CONFIG_IP_NF_MATCH_PKTTYPE=m
# CONFIG_IP_NF_MATCH_MARK is not set
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_MPORT=m
CONFIG_IP_NF_MATCH_TOS=m
! CONFIG_IP_NF_MATCH_TIME=m
! CONFIG_IP_NF_MATCH_RANDOM=m
! CONFIG_IP_NF_MATCH_PSD=m
! CONFIG_IP_NF_MATCH_NTH=m
! CONFIG_IP_NF_MATCH_IPV4OPTIONS=m
! CONFIG_IP_NF_MATCH_ECN=m
! CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
! CONFIG_IP_NF_MATCH_REALM=m
! CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
! CONFIG_IP_NF_MATCH_IPLIMIT=m
! CONFIG_IP_NF_MATCH_CONNTRACK=m
CONFIG_IP_NF_MATCH_UNCLEAN=m
CONFIG_IP_NF_MATCH_OWNER=m
***************
*** 212,217 ****
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
! # CONFIG_IP_NF_TARGET_SAME is not set
! # CONFIG_IP_NF_TARGET_NETMAP is not set
CONFIG_IP_NF_NAT_LOCAL=y
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
--- 218,224 ----
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
! CONFIG_IP_NF_NAT_H323=m
! CONFIG_IP_NF_TARGET_SAME=m
! CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_NAT_LOCAL=y
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
***************
*** 219,222 ****
--- 226,230 ----
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_PPTP=m
+ CONFIG_IP_NF_NAT_PROTO_GRE=m
# CONFIG_IP_NF_MANGLE is not set
CONFIG_IP_NF_TARGET_LOG=m
***************
*** 232,239 ****
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
-
- #
- #
- #
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
--- 240,243 ----
***************
*** 259,262 ****
--- 263,267 ----
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CBQ=m
+ CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_CSZ=m
CONFIG_NET_SCH_PRIO=m
***************
*** 285,292 ****
# CONFIG_NET_PKTGEN is not set
CONFIG_IPSEC=m
-
- #
- # IPSec options (FreeS/WAN)
- #
CONFIG_IPSEC_IPIP=y
CONFIG_IPSEC_AH=y
--- 290,293 ----
***************
*** 314,321 ****
#
CONFIG_BLK_DEV_IDE=y
-
- #
- # Please see Documentation/ide.txt for help/info on IDE drives
- #
# CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HD is not set
--- 315,318 ----
***************
*** 338,345 ****
# CONFIG_BLK_DEV_IDESCSI is not set
# CONFIG_IDE_TASK_IOCTL is not set
-
- #
- # IDE chipset support/bugfixes
- #
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
--- 335,338 ----
***************
*** 487,491 ****
CONFIG_CS89x0=m
CONFIG_TULIP=m
- CONFIG_TC35815=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
--- 480,483 ----
***************
*** 493,501 ****
CONFIG_DGRS=m
CONFIG_DM9102=m
! CONFIG_EEPRO100=y
# CONFIG_LNE390 is not set
CONFIG_FEALNX=m
CONFIG_NATSEMI=m
- # CONFIG_NATSEMI_CABLE_MAGIC is not set
CONFIG_NE2K_PCI=m
# CONFIG_NE3210 is not set
--- 485,493 ----
CONFIG_DGRS=m
CONFIG_DM9102=m
! CONFIG_EEPRO100=m
! # CONFIG_E100 is not set
# CONFIG_LNE390 is not set
CONFIG_FEALNX=m
CONFIG_NATSEMI=m
CONFIG_NE2K_PCI=m
# CONFIG_NE3210 is not set
***************
*** 506,514 ****
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
! # CONFIG_8139_NEW_RX_RESET is not set
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
CONFIG_TLAN=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
--- 498,508 ----
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_8139TOO_8129=y
! # CONFIG_8139_OLD_RX_RESET is not set
CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SUNDANCE=m
+ # CONFIG_SUNDANCE_MMIO is not set
CONFIG_TLAN=m
+ CONFIG_TC35815=m
CONFIG_VIA_RHINE=m
# CONFIG_VIA_RHINE_MMIO is not set
***************
*** 522,525 ****
--- 516,520 ----
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
+ CONFIG_E1000=m
# CONFIG_MYRI_SBUS is not set
CONFIG_NS83820=m
***************
*** 590,605 ****
#
- # low-level hardware drivers
- #
-
- #
# Passive ISDN cards
#
CONFIG_ISDN_DRV_HISAX=m
CONFIG_ISDN_HISAX=y
-
- #
- # D-channel protocol features
- #
CONFIG_HISAX_EURO=y
CONFIG_DE_AOC=y
--- 585,592 ----
***************
*** 610,638 ****
CONFIG_HISAX_NI1=y
CONFIG_HISAX_MAX_CARDS=8
-
- #
- # HiSax supported cards
- #
CONFIG_HISAX_16_0=y
CONFIG_HISAX_16_3=y
- CONFIG_HISAX_TELESPCI=y
- CONFIG_HISAX_S0BOX=y
CONFIG_HISAX_AVM_A1=y
- CONFIG_HISAX_FRITZPCI=y
- CONFIG_HISAX_AVM_A1_PCMCIA=y
- CONFIG_HISAX_ELSA=y
CONFIG_HISAX_IX1MICROR2=y
- CONFIG_HISAX_DIEHLDIVA=y
CONFIG_HISAX_ASUSCOM=y
CONFIG_HISAX_TELEINT=y
CONFIG_HISAX_HFCS=y
- CONFIG_HISAX_SEDLBAUER=y
CONFIG_HISAX_SPORTSTER=y
CONFIG_HISAX_MIC=y
CONFIG_HISAX_NETJET=y
CONFIG_HISAX_NETJET_U=y
CONFIG_HISAX_NICCY=y
- CONFIG_HISAX_ISURF=y
- CONFIG_HISAX_HSTSAPHIR=y
CONFIG_HISAX_BKM_A4T=y
CONFIG_HISAX_SCT_QUADRO=y
--- 597,621 ----
CONFIG_HISAX_NI1=y
CONFIG_HISAX_MAX_CARDS=8
CONFIG_HISAX_16_0=y
CONFIG_HISAX_16_3=y
CONFIG_HISAX_AVM_A1=y
CONFIG_HISAX_IX1MICROR2=y
CONFIG_HISAX_ASUSCOM=y
CONFIG_HISAX_TELEINT=y
CONFIG_HISAX_HFCS=y
CONFIG_HISAX_SPORTSTER=y
CONFIG_HISAX_MIC=y
+ CONFIG_HISAX_ISURF=y
+ CONFIG_HISAX_HSTSAPHIR=y
+ CONFIG_HISAX_TELESPCI=y
+ CONFIG_HISAX_S0BOX=y
+ CONFIG_HISAX_FRITZPCI=y
+ CONFIG_HISAX_AVM_A1_PCMCIA=y
+ CONFIG_HISAX_ELSA=y
+ CONFIG_HISAX_DIEHLDIVA=y
+ CONFIG_HISAX_SEDLBAUER=y
CONFIG_HISAX_NETJET=y
CONFIG_HISAX_NETJET_U=y
CONFIG_HISAX_NICCY=y
CONFIG_HISAX_BKM_A4T=y
CONFIG_HISAX_SCT_QUADRO=y
***************
*** 641,644 ****
--- 624,628 ----
CONFIG_HISAX_W6692=y
CONFIG_HISAX_HFC_SX=y
+ # CONFIG_HISAX_ENTERNOW_PCI is not set
# CONFIG_HISAX_DEBUG is not set
# CONFIG_HISAX_SEDLBAUER_CS is not set
***************
*** 699,702 ****
--- 683,687 ----
# CONFIG_ISI is not set
# CONFIG_SYNCLINK is not set
+ # CONFIG_SYNCLINKMP is not set
CONFIG_N_HDLC=m
# CONFIG_RISCOM8 is not set
***************
*** 730,737 ****
# CONFIG_INPUT_SERIO is not set
# CONFIG_INPUT_SERPORT is not set
-
- #
- # Joysticks
- #
# CONFIG_INPUT_ANALOG is not set
# CONFIG_INPUT_A3D is not set
--- 715,718 ----
***************
*** 761,764 ****
--- 742,746 ----
# CONFIG_AMD_RNG is not set
# CONFIG_INTEL_RNG is not set
+ # CONFIG_AMD_PM768 is not set
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
***************
*** 794,797 ****
--- 776,781 ----
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
CONFIG_EXT3_FS=y
***************
*** 811,814 ****
--- 795,801 ----
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
+ # CONFIG_JFS_FS is not set
+ # CONFIG_JFS_DEBUG is not set
+ # CONFIG_JFS_STATISTICS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_VXFS_FS is not set
***************
*** 841,844 ****
--- 828,832 ----
# CONFIG_NFSD is not set
# CONFIG_NFSD_V3 is not set
+ # CONFIG_NFSD_TCP is not set
# CONFIG_SUNRPC is not set
# CONFIG_LOCKD is not set
***************
*** 854,858 ****
# CONFIG_NCPFS_EXTRAS is not set
# CONFIG_ZISOFS_FS is not set
- # CONFIG_ZLIB_FS_INFLATE is not set
#
--- 842,845 ----
***************
*** 928,957 ****
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
-
- #
- # Miscellaneous USB options
- #
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_LONG_TIMEOUT is not set
-
- #
- # USB Host Controller Drivers
- #
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_UHCI=m
CONFIG_USB_UHCI_ALT=m
CONFIG_USB_OHCI=m
-
- #
- # USB Device Class drivers
- #
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_BLUETOOTH is not set
!
! #
! # SCSI support is needed for USB Storage
! #
# CONFIG_USB_STORAGE is not set
# CONFIG_USB_STORAGE_DEBUG is not set
--- 915,929 ----
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_LONG_TIMEOUT is not set
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_UHCI=m
CONFIG_USB_UHCI_ALT=m
CONFIG_USB_OHCI=m
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_BLUETOOTH is not set
! # CONFIG_USB_MIDI is not set
# CONFIG_USB_STORAGE is not set
# CONFIG_USB_STORAGE_DEBUG is not set
***************
*** 962,980 ****
# CONFIG_USB_STORAGE_HP8200e is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
!
! #
! # USB Human Interface Devices (HID)
! #
! CONFIG_USB_HID=y
# CONFIG_USB_HIDINPUT is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_WACOM is not set
-
- #
- # USB Imaging devices
- #
# CONFIG_USB_DC2XX is not set
# CONFIG_USB_MDC800 is not set
--- 934,948 ----
# CONFIG_USB_STORAGE_HP8200e is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
+ # CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
! # CONFIG_USB_HID is not set
# CONFIG_USB_HIDINPUT is not set
# CONFIG_USB_HIDDEV is not set
+ CONFIG_USB_KBD=y
+ # CONFIG_USB_MOUSE is not set
+ # CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_DC2XX is not set
# CONFIG_USB_MDC800 is not set
***************
*** 982,997 ****
# CONFIG_USB_MICROTEK is not set
# CONFIG_USB_HPUSBSCSI is not set
-
- #
- # USB Multimedia devices
- #
-
- #
- # Video4Linux support is needed for USB Multimedia device support
- #
-
- #
- # USB Network adaptors
- #
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
--- 950,953 ----
***************
*** 1000,1007 ****
CONFIG_USB_CDCETHER=m
# CONFIG_USB_USBNET is not set
-
- #
- # USB port drivers
- #
# CONFIG_USB_USS720 is not set
--- 956,959 ----
***************
*** 1010,1046 ****
#
# CONFIG_USB_SERIAL is not set
- # CONFIG_USB_SERIAL_GENERIC is not set
- # CONFIG_USB_SERIAL_BELKIN is not set
- # CONFIG_USB_SERIAL_WHITEHEAT is not set
- # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
- # CONFIG_USB_SERIAL_EMPEG is not set
- # CONFIG_USB_SERIAL_FTDI_SIO is not set
- # CONFIG_USB_SERIAL_VISOR is not set
- # CONFIG_USB_SERIAL_IPAQ is not set
- # CONFIG_USB_SERIAL_IR is not set
- # CONFIG_USB_SERIAL_EDGEPORT is not set
- # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
- # CONFIG_USB_SERIAL_KEYSPAN is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
- # CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
- # CONFIG_USB_SERIAL_MCT_U232 is not set
- # CONFIG_USB_SERIAL_KLSI is not set
- # CONFIG_USB_SERIAL_PL2303 is not set
- # CONFIG_USB_SERIAL_CYBERJACK is not set
- # CONFIG_USB_SERIAL_XIRCOM is not set
- # CONFIG_USB_SERIAL_OMNINET is not set
-
- #
- # USB Miscellaneous drivers
- #
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_BRLVGER is not set
#
--- 962,970 ----
#
# CONFIG_USB_SERIAL is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_AUERSWALD is not set
+ # CONFIG_USB_TIGL is not set
# CONFIG_USB_BRLVGER is not set
+ # CONFIG_USB_LCD is not set
#
***************
*** 1053,1054 ****
--- 977,984 ----
#
# CONFIG_DEBUG_KERNEL is not set
+
+ #
+ # Library routines
+ #
+ CONFIG_ZLIB_INFLATE=m
+ CONFIG_ZLIB_DEFLATE=m
|