aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-23 12:33:19 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-23 12:33:19 +0000
commit9e14302d9493d524f5d74e3c1fa4dcd0d6fe61fc (patch)
tree54776a106ff71ed1f2baab8520bcd51809311458 /target/linux
parent8a96a235963c9a87957e7fa41dfc5bb29e731973 (diff)
downloadupstream-9e14302d9493d524f5d74e3c1fa4dcd0d6fe61fc.tar.gz
upstream-9e14302d9493d524f5d74e3c1fa4dcd0d6fe61fc.tar.bz2
upstream-9e14302d9493d524f5d74e3c1fa4dcd0d6fe61fc.zip
[uml] add 3.3 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31445 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/uml/config/i3862
-rw-r--r--target/linux/uml/config/x86_642
-rw-r--r--target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch14
3 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 71246861cd..e5c1ce4212 100644
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -29,6 +29,7 @@ CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
CONFIG_DNOTIFY=y
CONFIG_ELF_CORE=y
# CONFIG_EMBEDDED is not set
+# CONFIG_EARLY_PRINTK is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS=y
@@ -119,6 +120,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SOFT_WATCHDOG=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SQUASHFS_EMBEDDED=y
CONFIG_SSL=y
CONFIG_SSL_CHAN="pty"
diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64
index 42bf07024e..89d2e43d99 100644
--- a/target/linux/uml/config/x86_64
+++ b/target/linux/uml/config/x86_64
@@ -32,6 +32,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
CONFIG_DNOTIFY=y
CONFIG_ELF_CORE=y
+# CONFIG_EARLY_PRINTK is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS=y
@@ -103,6 +104,7 @@ CONFIG_SMP_BROKEN=y
CONFIG_SOFT_WATCHDOG=m
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
CONFIG_SQUASHFS_EMBEDDED=y
CONFIG_SSL=y
CONFIG_SSL_CHAN="pty"
diff --git a/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
new file mode 100644
index 0000000000..f4aba9bd7a
--- /dev/null
+++ b/target/linux/uml/patches-3.3/901-lib_zlib_deflate_visible.patch
@@ -0,0 +1,14 @@
+make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in
+or as a module
+
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -98,7 +98,7 @@ config ZLIB_INFLATE
+ tristate
+
+ config ZLIB_DEFLATE
+- tristate
++ tristate "Zlib compression"
+
+ config LZO_COMPRESS
+ tristate