aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-03-21 14:02:30 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-03-21 14:02:30 +0000
commitecf34611c7d70fdb49e9b3ce443545cc24725067 (patch)
tree28c784e694fc104372a1ae23dfac85993dbb408a /target/linux
parent78a2d5aa35033aca7eb0c2dbcf0f694e451a7563 (diff)
downloadupstream-ecf34611c7d70fdb49e9b3ce443545cc24725067.tar.gz
upstream-ecf34611c7d70fdb49e9b3ce443545cc24725067.tar.bz2
upstream-ecf34611c7d70fdb49e9b3ce443545cc24725067.zip
x86: do no overwrite CONFIG_SCSI_LOWLEVEL
CONFIG_SCSI_LOWLEVEL is needed for some packages. Backport commit r19759 into kernel 2.6.30 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20340 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/config-2.6.303
-rw-r--r--target/linux/x86/config-default1
-rw-r--r--target/linux/x86/olpc/config-2.6.311
3 files changed, 2 insertions, 3 deletions
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