[kernel] r14487 - in dists/trunk/linux-2.6/debian/config: amd64 i386 kernelarch-x86
Bastian Blank
waldi at alioth.debian.org
Thu Oct 29 09:34:48 UTC 2009
Author: waldi
Date: Thu Oct 29 09:34:47 2009
New Revision: 14487
Log:
debian/config/amd64/config, debian/config/i386/config,
debian/config/kernelarch-x86/config: Move options.
Modified:
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config Thu Oct 29 09:31:47 2009 (r14486)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Thu Oct 29 09:34:47 2009 (r14487)
@@ -1129,89 +1129,6 @@
# CONFIG_DEBUG_PAGEALLOC is not set
##
-## file: net/atm/Kconfig
-##
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-
-##
-## file: net/ax25/Kconfig
-##
-CONFIG_HAMRADIO=y
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-##
-## file: net/decnet/Kconfig
-##
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-
-##
-## file: net/decnet/netfilter/Kconfig
-##
-CONFIG_DECNET_NF_GRABULATOR=m
-
-##
-## file: net/econet/Kconfig
-##
-CONFIG_ECONET=m
-CONFIG_ECONET_AUNUDP=y
-CONFIG_ECONET_NATIVE=y
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-# CONFIG_IRDA_ULTRA is not set
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-##
-## file: net/irda/ircomm/Kconfig
-##
-CONFIG_IRCOMM=m
-
-##
-## file: net/irda/irlan/Kconfig
-##
-CONFIG_IRLAN=m
-
-##
-## file: net/irda/irnet/Kconfig
-##
-CONFIG_IRNET=m
-
-##
-## file: net/lapb/Kconfig
-##
-CONFIG_LAPB=m
-
-##
-## file: net/wanrouter/Kconfig
-##
-CONFIG_WAN_ROUTER=m
-
-##
-## file: net/x25/Kconfig
-##
-CONFIG_X25=m
-
-##
## file: sound/drivers/Kconfig
##
CONFIG_SND_DUMMY=m
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config Thu Oct 29 09:31:47 2009 (r14486)
+++ dists/trunk/linux-2.6/debian/config/i386/config Thu Oct 29 09:34:47 2009 (r14487)
@@ -1323,89 +1323,6 @@
# CONFIG_DEBUG_PAGEALLOC is not set
##
-## file: net/atm/Kconfig
-##
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-
-##
-## file: net/ax25/Kconfig
-##
-CONFIG_HAMRADIO=y
-CONFIG_AX25=m
-# CONFIG_AX25_DAMA_SLAVE is not set
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-##
-## file: net/decnet/Kconfig
-##
-CONFIG_DECNET=m
-# CONFIG_DECNET_ROUTER is not set
-
-##
-## file: net/decnet/netfilter/Kconfig
-##
-CONFIG_DECNET_NF_GRABULATOR=m
-
-##
-## file: net/econet/Kconfig
-##
-CONFIG_ECONET=m
-CONFIG_ECONET_AUNUDP=y
-CONFIG_ECONET_NATIVE=y
-
-##
-## file: net/ipx/Kconfig
-##
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-
-##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-# CONFIG_IRDA_ULTRA is not set
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-##
-## file: net/irda/ircomm/Kconfig
-##
-CONFIG_IRCOMM=m
-
-##
-## file: net/irda/irlan/Kconfig
-##
-CONFIG_IRLAN=m
-
-##
-## file: net/irda/irnet/Kconfig
-##
-CONFIG_IRNET=m
-
-##
-## file: net/lapb/Kconfig
-##
-CONFIG_LAPB=m
-
-##
-## file: net/wanrouter/Kconfig
-##
-CONFIG_WAN_ROUTER=m
-
-##
-## file: net/x25/Kconfig
-##
-CONFIG_X25=m
-
-##
## file: sound/drivers/Kconfig
##
CONFIG_SND_DUMMY=m
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Thu Oct 29 09:31:47 2009 (r14486)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Thu Oct 29 09:34:47 2009 (r14487)
@@ -276,11 +276,94 @@
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
##
+## file: net/atm/Kconfig
+##
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+
+##
+## file: net/ax25/Kconfig
+##
+CONFIG_HAMRADIO=y
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+##
+## file: net/decnet/Kconfig
+##
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+
+##
+## file: net/decnet/netfilter/Kconfig
+##
+CONFIG_DECNET_NF_GRABULATOR=m
+
+##
+## file: net/econet/Kconfig
+##
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+
+##
## file: net/ipv6/Kconfig
##
CONFIG_IPV6=y
##
+## file: net/ipx/Kconfig
+##
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+
+##
+## file: net/irda/Kconfig
+##
+CONFIG_IRDA=m
+# CONFIG_IRDA_ULTRA is not set
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+##
+## file: net/irda/ircomm/Kconfig
+##
+CONFIG_IRCOMM=m
+
+##
+## file: net/irda/irlan/Kconfig
+##
+CONFIG_IRLAN=m
+
+##
+## file: net/irda/irnet/Kconfig
+##
+CONFIG_IRNET=m
+
+##
+## file: net/lapb/Kconfig
+##
+CONFIG_LAPB=m
+
+##
+## file: net/wanrouter/Kconfig
+##
+CONFIG_WAN_ROUTER=m
+
+##
+## file: net/x25/Kconfig
+##
+CONFIG_X25=m
+
+##
## file: unknown
##
CONFIG_DMAR_GFX_WA=y
More information about the Kernel-svn-changes
mailing list