x86: do no overwrite CONFIG_SCSI_LOWLEVEL

[openwrt-10.03/.git] / target / linux / x86 / olpc / config-2.6.31

diff --git a/target/linux/x86/olpc/config-2.6.31 b/target/linux/x86/olpc/config-2.6.31
index 1907d34695f87934329a2d3242fa1d762b3ae01f..7db4baa7c4d4c69c4b3a72bc368fa9e52983bcf8 100644 (file)
--- a/target/linux/x86/olpc/config-2.6.31
+++ b/target/linux/x86/olpc/config-2.6.31
@@ -22,7 +22,6 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_WMI is not set
 CONFIG_ACPI=y
-# CONFIG_AGP is not set
 # CONFIG_APM is not set
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
@@ -43,7 +42,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASUS_LAPTOP is not set
 CONFIG_ATA_GENERIC=y
-# CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=y
 CONFIG_ATA=y
 # CONFIG_AUDIT_ARCH is not set
@@ -54,7 +52,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_BASE_SMALL=0
 CONFIG_BATTERY_OLPC=y
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=y
@@ -151,7 +148,6 @@ CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 CONFIG_EARLY_PRINTK=y
-# CONFIG_EDAC is not set
 # CONFIG_EDD is not set
 # CONFIG_EFI is not set
 CONFIG_ELF_CORE=y
@@ -255,7 +251,6 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
 CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
 # CONFIG_I8K is not set
 # CONFIG_IMA is not set
 CONFIG_INITRAMFS_SOURCE=""
@@ -283,10 +278,8 @@ CONFIG_IO_DELAY_TYPE_UDELAY=2
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
-# CONFIG_ISDN is not set
 # CONFIG_KALLSYMS_ALL is not set
 CONFIG_KALLSYMS=y
-# CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KEXEC_JUMP is not set
@@ -313,7 +306,6 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
-# CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MARKERS=y
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MCA is not set
@@ -402,7 +394,6 @@ CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
-CONFIG_PCI=y
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PDA_POWER is not set
 CONFIG_PERF_COUNTERS=y
@@ -439,7 +430,6 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHEDSTATS=y
-# CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_SCSI=y
 # CONFIG_SCx200 is not set
 # CONFIG_SDIO_UART is not set
@@ -458,7 +448,6 @@ CONFIG_SERIO=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
-# CONFIG_SMP is not set
 # CONFIG_SPARSE_IRQ is not set
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_STACKTRACE=y
@@ -469,7 +458,6 @@ CONFIG_SUSPEND=y
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
 # CONFIG_THINKPAD_ACPI is not set
-CONFIG_TICK_ONESHOT=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
 CONFIG_TRACEPOINTS=y