diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-07-18 13:01:32 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-07-18 13:01:32 +0000 |
| commit | 0f2e784408c9c7471456b7bd0d9a67f295f0ee42 (patch) | |
| tree | 4865654fe9186274214659af5b13f4fcdf53f5fc /target/linux/uml-2.6 | |
| parent | c614e53d29df648d0e103177007e3f12c9bb333b (diff) | |
| download | master-31e0f0ae-0f2e784408c9c7471456b7bd0d9a67f295f0ee42.tar.gz master-31e0f0ae-0f2e784408c9c7471456b7bd0d9a67f295f0ee42.tar.bz2 master-31e0f0ae-0f2e784408c9c7471456b7bd0d9a67f295f0ee42.zip | |
Resync x86_64 kernel config and make uml build ext2 images by default
SVN-Revision: 8034
Diffstat (limited to 'target/linux/uml-2.6')
| -rw-r--r-- | target/linux/uml-2.6/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml-2.6/config/x86_64 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml-2.6/Makefile index 2a2c31924f..a54d2cd71f 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 615c7c43ae..8a7f031a1d 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 |