[kernel] r9919 - dists/trunk/linux-2.6/debian/config

[Maximilian Attems]

Author: maks
Date: Sat Dec  8 00:48:47 2007
New Revision: 9919

Log:
topconfig continue grouping after network input variables
no functional change


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

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Dec  8 00:48:47 2007
@@ -968,6 +968,60 @@
 CONFIG_HDLC_X25=m
 
 #
+# Refer to the file README.mlppp, provided by PC300 package.
+#
+CONFIG_ATM_DUMMY=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOL2TP=m
+CONFIG_SLHC=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_UNDOCREQ is not set
+# CONFIG_GIGASET_DEBUG is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_MOUSE_PS2_ALPS=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_INPUT_ATI_REMOTE=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+
+#
 # USB Serial Converter support
 #
 CONFIG_USB_SERIAL=m
@@ -1665,38 +1719,14 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
 # CONFIG_JFFS2_SUMMARY is not set
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOL2TP=m
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_RFD_FTL=m
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
-CONFIG_ATM_DUMMY=m
 CONFIG_SYNCLINK_GT=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_USB_UEAGLEATM=m
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-# CONFIG_INPUT_POLLDEV is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_ENE_TUNE=y
@@ -1716,20 +1746,14 @@
 CONFIG_AMD8111E_NAPI=y
 CONFIG_R8169_NAPI=y
 CONFIG_ADAPTEC_STARFIRE_NAPI=y
-# CONFIG_GIGASET_UNDOCREQ is not set
 CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_RTC_LIB=m
-CONFIG_GIGASET_BASE=m
 CONFIG_SND_RIPTIDE=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_USB_ZC0301=m
 CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB_GADGET_AT91 is not set
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-CONFIG_ISDN_DRV_GIGASET=m
 CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_GIGASET_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_SND_ALS300=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
@@ -1977,7 +2001,6 @@
 CONFIG_SND_LAYLA24=m
 CONFIG_SND_MONA=m
 CONFIG_LEDS_NET48XX=m
-# CONFIG_INPUT_EVBUG is not set
 # CONFIG_LEGACY_PTYS is not set
 
 CONFIG_PCNET32_NAPI=y
@@ -1987,7 +2010,6 @@
 CONFIG_USB_U132_HCD=m
 CONFIG_SND_MTS64=m
 CONFIG_SMSC37B787_WDT=m
-CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SSFDC=m
@@ -1996,7 +2018,6 @@
 CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_W83697HF_WDT=m
-CONFIG_SLHC=m
 CONFIG_TIFM_CORE=m
 CONFIG_ITCO_WDT=m
 CONFIG_USB_MIDI_GADGET=m
@@ -2027,7 +2048,6 @@
 CONFIG_DAB=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_EDAC_I82975X=m
 CONFIG_SND_SB16_DSP=m
 # CONFIG_SND_HDA_HWDEP is not set