[IPCop-cvs] CVS: ipcop/config/kernel kernel.config,1.5,1.6

[Mark W. <ri...@us...>]

Update of /cvsroot/ipcop/ipcop/config/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv22626/config/kernel

Modified Files:
	kernel.config 
Log Message:
Updated to kernel 2.4.18

Index: kernel.config
===================================================================
RCS file: /cvsroot/ipcop/ipcop/config/kernel/kernel.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** kernel.config	14 Feb 2002 09:31:41 -0000	1.5
--- kernel.config	26 Feb 2002 21:02:05 -0000	1.6
***************
*** 1,4 ****
  #
! # Automatically generated by make menuconfig: don't edit
  #
  CONFIG_X86=y
--- 1,4 ----
  #
! # Automatically generated make config: don't edit
  #
  CONFIG_X86=y
***************
*** 32,35 ****
--- 32,36 ----
  # CONFIG_MK6 is not set
  # CONFIG_MK7 is not set
+ # CONFIG_MELAN is not set
  # CONFIG_MCRUSOE is not set
  # CONFIG_MWINCHIPC6 is not set
***************
*** 174,177 ****
--- 175,179 ----
  CONFIG_IP_NF_MATCH_MULTIPORT=m
  # CONFIG_IP_NF_MATCH_TOS is not set
+ # CONFIG_IP_NF_MATCH_AH_ESP is not set
  # CONFIG_IP_NF_MATCH_LENGTH is not set
  # CONFIG_IP_NF_MATCH_TTL is not set
***************
*** 190,193 ****
--- 192,196 ----
  # CONFIG_IP_NF_MANGLE is not set
  CONFIG_IP_NF_TARGET_LOG=m
+ # CONFIG_IP_NF_TARGET_ULOG is not set
  # CONFIG_IP_NF_TARGET_TCPMSS is not set
  # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
***************
*** 197,200 ****
--- 200,207 ----
  # CONFIG_ATM is not set
  # CONFIG_VLAN_8021Q is not set
+ 
+ #
+ #  
+ #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
***************
*** 215,218 ****
--- 222,229 ----
  # CONFIG_NET_SCHED is not set
  CONFIG_IPSEC=m
+ 
+ #
+ # IPSec options (FreeS/WAN)
+ #
  CONFIG_IPSEC_IPIP=y
  CONFIG_IPSEC_AH=y
***************
*** 240,243 ****
--- 251,258 ----
  #
  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
***************
*** 258,261 ****
--- 273,280 ----
  # CONFIG_BLK_DEV_IDEFLOPPY is not set
  # CONFIG_BLK_DEV_IDESCSI is not set
+ 
+ #
+ # IDE chipset support/bugfixes
+ #
  CONFIG_BLK_DEV_CMD640=y
  # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
***************
*** 357,361 ****
  # CONFIG_SUNBMAC is not set
  # CONFIG_SUNQE is not set
- # CONFIG_SUNLANCE is not set
  CONFIG_SUNGEM=m
  CONFIG_NET_VENDOR_3COM=y
--- 376,379 ----
***************
*** 409,412 ****
--- 427,431 ----
  CONFIG_FEALNX=m
  CONFIG_NATSEMI=m
+ # CONFIG_NATSEMI_CABLE_MAGIC is not set
  CONFIG_NE2K_PCI=m
  CONFIG_NE3210=m
***************
*** 417,420 ****
--- 436,440 ----
  # 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
***************
*** 497,503 ****
--- 517,531 ----
  
  #
+ # low-level hardware drivers
+ #
+ 
+ #
  # Passive ISDN cards
  #
  CONFIG_ISDN_DRV_HISAX=m
+ 
+ #
+ #   D-channel protocol features
+ #
  CONFIG_HISAX_EURO=y
  CONFIG_DE_AOC=y
***************
*** 508,511 ****
--- 536,543 ----
  CONFIG_HISAX_NI1=y
  CONFIG_HISAX_MAX_CARDS=8
+ 
+ #
+ #   HiSax supported cards
+ #
  CONFIG_HISAX_16_0=y
  CONFIG_HISAX_16_3=y
***************
*** 640,643 ****
--- 672,683 ----
  #
  # CONFIG_INPUT_GAMEPORT is not set
+ 
+ #
+ # Input core support is needed for gameports
+ #
+ 
+ #
+ # Input core support is needed for joysticks
+ #
  # CONFIG_QIC02_TAPE is not set
  
***************
*** 775,778 ****
--- 815,819 ----
  # CONFIG_NLS_CODEPAGE_874 is not set
  # CONFIG_NLS_ISO8859_8 is not set
+ # CONFIG_NLS_CODEPAGE_1250 is not set
  # CONFIG_NLS_CODEPAGE_1251 is not set
  # CONFIG_NLS_ISO8859_1 is not set
***************
*** 813,824 ****
--- 854,881 ----
  CONFIG_USB=y
  # CONFIG_USB_DEBUG is not set
+ 
+ #
+ # Miscellaneous USB options
+ #
  # CONFIG_USB_DEVICEFS is not set
  # CONFIG_USB_BANDWIDTH is not set
  # CONFIG_USB_LONG_TIMEOUT is not set
+ 
+ #
+ # USB Controllers
+ #
  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_BLUETOOTH is not set
+ 
+ #
+ #   SCSI support is needed for USB Storage
+ #
  # CONFIG_USB_STORAGE is not set
  # CONFIG_USB_STORAGE_DEBUG is not set
***************
*** 832,835 ****
--- 889,904 ----
  # CONFIG_USB_ACM is not set
  # CONFIG_USB_PRINTER is not set
+ 
+ #
+ # USB Human Interface Devices (HID)
+ #
+ 
+ #
+ #   Input core support is needed for USB HID
+ #
+ 
+ #
+ # USB Imaging devices
+ #
  # CONFIG_USB_DC2XX is not set
  # CONFIG_USB_MDC800 is not set
***************
*** 837,840 ****
--- 906,921 ----
  # 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 is not set
  # CONFIG_USB_KAWETH is not set
***************
*** 842,845 ****
--- 923,930 ----
  # CONFIG_USB_CDCETHER is not set
  # CONFIG_USB_USBNET is not set
+ 
+ #
+ # USB port drivers
+ #
  # CONFIG_USB_USS720 is not set
  
***************
*** 855,858 ****
--- 940,944 ----
  # 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
***************
*** 868,875 ****
--- 954,966 ----
  # 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