update uml-2.6 to 2.6.21.1 on i386, fix uml-2.6 sound modules packaging

SVN-Revision: 7485

2 files changed, 20 insertions, 4 deletions

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index c8ee64228a..5245b96de3 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -118,8 +118,17 @@ define KernelPackage/soundcore/2.6
 	$(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
 endef
+
+define KernelPackage/soundcore/uml-2.6
+  FILES:= \
+	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+endef
+
 $(eval $(call KernelPackage,soundcore))
 
+
 define KernelPackage/loop
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support
diff --git a/target/linux/uml-2.6/config/i386 b/target/linux/uml-2.6/config/i386
index 49b4083c7b..35a7e74b50 100644
--- a/target/linux/uml-2.6/config/i386
+++ b/target/linux/uml-2.6/config/i386
@@ -1,10 +1,12 @@
 # CONFIG_3_LEVEL_PGTABLES is not set
 # CONFIG_64BIT is not set
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HAS_SC_SIGNALS=y
 CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
 # CONFIG_ATM is not set
 CONFIG_BASE_SMALL=0
-CONFIG_BINFMT_MISC=m
+CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_COW_COMMON=y
 CONFIG_BLK_DEV_UBD=y
 CONFIG_BLK_DEV_UBD_SYNC=y
@@ -14,6 +16,7 @@ CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
 # CONFIG_CRYPTO_AES_586 is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
@@ -25,6 +28,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_FW_LOADER is not set
+CONFIG_GENERIC_BUG=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HOSTAUDIO=m
@@ -59,6 +63,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MCONSOLE=y
+# CONFIG_MCORE2 is not set
 # CONFIG_MCRUSOE is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MEFFICEON is not set
@@ -82,6 +87,7 @@ 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
 # CONFIG_NFSD_V4 is not set
@@ -93,6 +99,7 @@ CONFIG_NLS=y
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NOCONFIG_CHAN is not set
+CONFIG_NO_IOMEM=y
 CONFIG_NULL_CHAN=y
 CONFIG_PORT_CHAN=y
 CONFIG_POSIX_MQUEUE=y
@@ -109,12 +116,14 @@ CONFIG_SOFT_WATCHDOG=m
 CONFIG_SQUASHFS_EMBEDDED=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"
+# CONFIG_STACKTRACE_SUPPORT is not set
 CONFIG_STATIC_LINK=y
 CONFIG_STDERR_CONSOLE=y
 CONFIG_STDIO_CONSOLE=y
 CONFIG_STUB_CODE=0xbfffe000
 CONFIG_STUB_DATA=0xbffff000
 CONFIG_STUB_START=0xbfffe000
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_TOP_ADDR=0xC0000000
 # CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
 CONFIG_TTY_CHAN=y
@@ -134,7 +143,6 @@ CONFIG_UML_SOUND=m
 CONFIG_UML_WATCHDOG=m
 CONFIG_UML_X86=y
 # CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_UNWIND_INFO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_X86_BSWAP=y
 CONFIG_X86_CMPXCHG=y
@@ -148,7 +156,6 @@ CONFIG_X86_POPAD_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_XADD=y
 CONFIG_XTERM_CHAN=y
-CONFIG_ZISOFS_FS=y
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZONE_DMA_FLAG=0