r3384 - branches/linux-kernel-2.6.12/debian/arch/i386

[Jurij Smakov]

Author: jurij-guest
Date: 2005-06-22 03:58:06 +0000 (Wed, 22 Jun 2005)
New Revision: 3384

Modified:
   branches/linux-kernel-2.6.12/debian/arch/i386/config.default
Log:
Just make config.default a copy of config.686, as it does
not really matter anyway. For details see the message at
http://lists.debian.org/debian-kernel/2004/08/msg01460.html


Modified: branches/linux-kernel-2.6.12/debian/arch/i386/config.default
===================================================================
--- branches/linux-kernel-2.6.12/debian/arch/i386/config.default	2005-06-22 03:51:08 UTC (rev 3383)
+++ branches/linux-kernel-2.6.12/debian/arch/i386/config.default	2005-06-22 03:58:06 UTC (rev 3384)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Tue Jun 21 23:48:55 2005
+# Tue Jun 21 23:39:34 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -826,7 +826,11 @@
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+CONFIG_IP_ROUTE_MULTIPATH_RR=m
+CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_DRR=m
 CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
@@ -1087,7 +1091,12 @@
 # CONFIG_CLS_U32_MARK is not set
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
-# CONFIG_NET_EMATCH is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 
@@ -1339,7 +1348,7 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
-# CONFIG_BNX2 is not set
+CONFIG_BNX2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -2242,7 +2251,7 @@
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
 CONFIG_FB_NVIDIA=m
-# CONFIG_FB_NVIDIA_I2C is not set
+CONFIG_FB_NVIDIA_I2C=y
 CONFIG_FB_RIVA=m
 CONFIG_FB_RIVA_I2C=y
 CONFIG_FB_RIVA_DEBUG=y
@@ -2268,7 +2277,7 @@
 CONFIG_FB_ATY_XL_INIT=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_SAVAGE=m
-# CONFIG_FB_SAVAGE_I2C is not set
+CONFIG_FB_SAVAGE_I2C=y
 # CONFIG_FB_SAVAGE_ACCEL is not set
 CONFIG_FB_SIS=m
 CONFIG_FB_SIS_300=y
@@ -2281,7 +2290,8 @@
 CONFIG_FB_TRIDENT=m
 # CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_FB_PM3 is not set
-# CONFIG_FB_GEODE is not set
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_GX1=m
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_VIRTUAL=m
 
@@ -2562,7 +2572,7 @@
 CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_ISD200=y
 CONFIG_USB_STORAGE_DPCM=y
-# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y