Another config update

svn path=/branches/linux-kernel-2.6.12/; revision=3359

debian/arch/i386/config.686

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12
-# Sat Jun 18 19:58:35 2005
+# Sat Jun 18 20:18:47 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -138,7 +138,7 @@ CONFIG_HIGHMEM=y
 CONFIG_MTRR=y
 # CONFIG_EFI is not set
 # CONFIG_REGPARM is not set
-CONFIG_SECCOMP=y
+# CONFIG_SECCOMP is not set
 
 #
 # Power management options (ACPI, APM)
@@ -201,7 +201,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
 # CPUFreq processor drivers
@@ -643,7 +643,9 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y
 CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
-# CONFIG_MEGARAID_NEWGEN is not set
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
@@ -1337,7 +1339,7 @@ CONFIG_R8169=m
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
-CONFIG_BNX2=m
+# CONFIG_BNX2 is not set
 
 #
 # Ethernet (10000 Mbit)