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

[Maximilian Attems]

Author: maks
Date: Mon May 21 15:29:32 2007
New Revision: 8665

Log:
continue to beautify toplevel config


Modified:
   dists/trunk/linux-2.6/debian/arch/config

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	Mon May 21 15:29:32 2007
@@ -666,12 +666,25 @@
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_SPI_BITBANG=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+ 
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=y
 CONFIG_TIPC_ZONES=3
+CONFIG_TIPC_CLUSTERS=1
+CONFIG_TIPC_NODES=255
+CONFIG_TIPC_SLAVE_NODES=0
+CONFIG_TIPC_PORTS=8191
+CONFIG_TIPC_LOG=0
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_DEV_APPLETALK=m
+
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_ELF_CORE=y
 CONFIG_USB_UEAGLEATM=m
-CONFIG_TIPC_NODES=255
 CONFIG_DVB_CX24123=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -681,7 +694,6 @@
 CONFIG_MTD_M25P80=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_TIPC=m
 CONFIG_USB_ATI_REMOTE2=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_SECURITY_NETWORK_XFRM=y
@@ -689,7 +701,6 @@
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_TIPC_CLUSTERS=1
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
@@ -715,22 +726,17 @@
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 # CONFIG_CRASH_DUMP is not set
 CONFIG_YENTA_TI=y
-CONFIG_TIPC_LOG=0
 CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_SCSI_QLA_FC=m
 CONFIG_SPI_BUTTERFLY=m
-CONFIG_TIPC_SLAVE_NODES=0
-# CONFIG_TIPC_DEBUG is not set
 # CONFIG_SLOB is not set
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_TIPC_PORTS=8191
 CONFIG_SENSORS_VT8231=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_OCFS2_FS=m
 CONFIG_SPI_MASTER=y
-CONFIG_TIPC_ADVANCED=y
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_SLAB=y
 CONFIG_MTD_DATAFLASH=m
@@ -977,7 +983,6 @@
 CONFIG_IPW2200_QOS=y
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_I2C_OCORES=m
-CONFIG_DEV_APPLETALK=m
 # CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_FB_BACKLIGHT is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y