[kernel] r5103 - dists/trunk/linux-2.6/debian/arch

[Simon Horman]

Author: horms
Date: Wed Dec 28 06:54:30 2005
New Revision: 5103

Modified:
   dists/trunk/linux-2.6/debian/arch/config
Log:
Remove duplicate options. Rod Whitby. http://lists.debian.org/debian-kernel/2005/12/msg00658.html

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Wed Dec 28 06:54:30 2005
@@ -110,13 +110,11 @@
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_6PACK=m
-CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_DVB_USB_DTT200U=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_SERIAL_8250_ACCENT=m
 CONFIG_FB_ARC=m
 CONFIG_FUSION_SPI=m
-# CONFIG_IP_FIB_TRIE is not set
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_FUSION_FC=m
 CONFIG_USB_ACECAD=m
@@ -125,22 +123,18 @@
 CONFIG_USB_CXACRU=m
 CONFIG_DVB_USB_A800=m
 CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TCP_CONG_HTCP=m
 CONFIG_BLK_DEV_IT821X=m
 CONFIG_TEXTSEARCH=y
 CONFIG_DRM_VIA=m
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_DVB_S5H1420=m
 CONFIG_SND_HDSPM=m
-CONFIG_TCP_CONG_HSTCP=m
 CONFIG_SENSORS_PCA9539=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_SKGE=m
 CONFIG_USB_GADGET_SELECTED=y
-CONFIG_TCP_CONG_VEGAS=m
 CONFIG_INFINIBAND_USER_VERBS=m
 CONFIG_USB_ITMTOUCH=m
-CONFIG_TCP_CONG_WESTWOOD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_SERIAL_8250_HUB6=m
@@ -156,12 +150,9 @@
 CONFIG_DVB_BCM3510=m
 CONFIG_SENSORS_MAX6875=m
 CONFIG_MTD_PLATRAM=m
-CONFIG_IP_FIB_HASH=y
 CONFIG_SENSORS_ADM9240=m
-CONFIG_TCP_CONG_HYBLA=m
 CONFIG_SENSORS_DS1374=m
 CONFIG_USB_XUSBATM=m
-CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_DVB_USB=m
 CONFIG_USB_LD=m