From: Hauke Mehrtens Date: Sun, 21 Mar 2010 14:02:30 +0000 (+0000) Subject: x86: do no overwrite CONFIG_SCSI_LOWLEVEL X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=eaae16b12ff15f9913f75271990c24c501baa115 x86: do no overwrite CONFIG_SCSI_LOWLEVEL CONFIG_SCSI_LOWLEVEL is needed for some packages. Backport commit r19759 into kernel 2.6.30 SVN-Revision: 20340 --- diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30 index b66a2e9d96..24fcb13402 100644 --- a/target/linux/x86/config-2.6.30 +++ b/target/linux/x86/config-2.6.30 @@ -193,6 +193,8 @@ CONFIG_ISA=y # CONFIG_IT87_WDT is not set # CONFIG_ITCO_WDT is not set CONFIG_KALLSYMS=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set CONFIG_KEXEC=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set @@ -311,7 +313,6 @@ CONFIG_RTC=y # CONFIG_SC520_WDT is not set # CONFIG_SCHED_HRTICK is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y -# CONFIG_SCSI_LOWLEVEL is not set CONFIG_SCSI=y # CONFIG_SCx200_GPIO is not set CONFIG_SCx200HR_TIMER=y diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default index 535eab3c38..9b20f1eabe 100644 --- a/target/linux/x86/config-default +++ b/target/linux/x86/config-default @@ -380,7 +380,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SCHED_MC is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set -# CONFIG_SCSI_LOWLEVEL is not set CONFIG_SCSI=y # CONFIG_SCx200_GPIO is not set CONFIG_SCx200HR_TIMER=y diff --git a/target/linux/x86/olpc/config-2.6.31 b/target/linux/x86/olpc/config-2.6.31 index 1144e9f28d..7db4baa7c4 100644 --- a/target/linux/x86/olpc/config-2.6.31 +++ b/target/linux/x86/olpc/config-2.6.31 @@ -430,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