summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-18 13:01:32 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-07-18 13:01:32 +0000
commitc1791fbd323e3eb23a245cd19074aeb248772790 (patch)
treebeeaec56174689bf8c7f6b8d473b6faa878a72d4 /target/linux
parent410fd2dad2ae43d42b14ec2753100027070fe596 (diff)
Resync x86_64 kernel config and make uml build ext2 images by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8034 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/uml-2.6/Makefile2
-rw-r--r--target/linux/uml-2.6/config/x86_646
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile
index 2a2c31924..a54d2cd71 100644
--- a/target/linux/uml-2.6/Makefile
+++ b/target/linux/uml-2.6/Makefile
@@ -20,7 +20,7 @@ ARCH:=$(shell uname -m | sed \
)
BOARD:=uml
BOARDNAME:=User Mode Linux
-FEATURES:=broken
+FEATURES:=broken ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
LINUX_VERSION:=2.6.22.1
diff --git a/target/linux/uml-2.6/config/x86_64 b/target/linux/uml-2.6/config/x86_64
index 615c7c43a..8a7f031a1 100644
--- a/target/linux/uml-2.6/config/x86_64
+++ b/target/linux/uml-2.6/config/x86_64
@@ -29,6 +29,7 @@ CONFIG_FS_POSIX_ACL=y
# CONFIG_FW_LOADER is not set
CONFIG_GENERIC_BUG=y
# CONFIG_HAMRADIO is not set
+CONFIG_HAS_DMA=y
CONFIG_HOSTAUDIO=m
CONFIG_HOSTFS=y
# CONFIG_HPPFS is not set
@@ -38,6 +39,7 @@ CONFIG_INITRAMFS_SOURCE=""
CONFIG_INIT_ENV_ARG_LIMIT=128
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_CFQ=y
+# CONFIG_IP_NF_MATCH_LAYER7 is not set
CONFIG_IRQ_RELEASE_METHOD=y
CONFIG_ISO9660_FS=y
CONFIG_JBD=y
@@ -54,9 +56,6 @@ CONFIG_MCONSOLE=y
# CONFIG_MMAPPER is not set
CONFIG_MODE_SKAS=y
CONFIG_NEST_LEVEL=0
-# CONFIG_NET_RADIO is not set
-CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
-# CONFIG_NET_SCH_CLK_JIFFIES is not set
CONFIG_NET_SCH_FIFO=y
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3_ACL=y
@@ -81,6 +80,7 @@ CONFIG_QUOTACTL=y
CONFIG_RELAY=y
CONFIG_RESOURCES_64BIT=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_SMP_BROKEN=y
CONFIG_SOFT_WATCHDOG=m