[kernel] r8270 - dists/trunk/linux-2.6/debian/arch/i386

[Frederik Schüler]

Author: fs
Date: Mon Feb  5 20:55:19 2007
New Revision: 8270

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686
Log:
Update i386 options


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Mon Feb  5 20:55:19 2007
@@ -1525,9 +1525,6 @@
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_IPOIB=m
-CONFIG_KVM=m                                                                   
-CONFIG_KVM_INTEL=m                                                             
-CONFIG_KVM_AMD=m                                                               
 CONFIG_JBD=m
 CONFIG_XFS_RT=y
 # CONFIG_HUGETLBFS is not set
@@ -1688,3 +1685,21 @@
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_SCSI_ARCMSR=m
+CONFIG_CRYPTO_TWOFISH_586=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_SERIAL_8250_EXAR_ST16C554=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+# CONFIG_HZ_300 is not set
+# CONFIG_RELOCATABLE is not set
+# CONFIG_MCORE2 is not set
+CONFIG_IOMAP_COPY=y
+CONFIG_PATA_WINBOND_VLB=m
+CONFIG_CRYPTO_DEV_GEODE=m
+# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
+CONFIG_PHYSICAL_ALIGN=0x100000
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_PARAVIRT=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_LEDS_WRAP=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	Mon Feb  5 20:55:19 2007
@@ -63,4 +63,3 @@
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_SUSPEND_SMP=y
 CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_CRYPTO_TWOFISH_586=m