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 b66a2e9d9696a93d40f24b08c0ff8f19041c8e51..24fcb134027e1bb1017aaf93764c6bb1dd38d114 100644 (file)
--- 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 535eab3c38dd22a73f2ab9ed7412fd3e4de0b371..9b20f1eabe68063740ba62eda65fc1e4e825246c 100644 (file)
--- 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 1144e9f28de4564a391e61013629df9b8bb0b236..7db4baa7c4d4c69c4b3a72bc368fa9e52983bcf8 100644 (file)
--- 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