summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-07 19:53:14 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-07 19:53:14 +0200
commitc20e67a4a06a377a277544a498338fa6a09e9e3f (patch)
tree1c2d187d233cb0783a9b6b41bef5555a62ab9112 /target
parent3b216c1da80a8f768d4bf93569efb742e63797d2 (diff)
parent208807cc63754f699107bbad24687b3ae1d326fe (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/linux/config/Config.in.kernel6
-rw-r--r--target/x86/kernel.config11
2 files changed, 14 insertions, 3 deletions
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 6bcb090df..0400d8db6 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -49,6 +49,12 @@ config ADK_KERNEL_RD_LZO
config ADK_KERNEL_KERNEL_LZO
boolean
+config ADK_KERNEL_RD_XZ
+ boolean
+
+config ADK_KERNEL_KERNEL_XZ
+ boolean
+
config ADK_KERNEL_INITRAMFS_SOURCE
string
default ""
diff --git a/target/x86/kernel.config b/target/x86/kernel.config
index ffd78bba4..aa6d60735 100644
--- a/target/x86/kernel.config
+++ b/target/x86/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/x86 2.6.39 Kernel Configuration
-# Thu Jul 14 19:13:32 2011
+# Thu Aug 4 19:45:52 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -67,8 +67,8 @@ CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
# CONFIG_KERNEL_LZO is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
@@ -873,6 +873,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
# CONFIG_CRYPTO is not set
+
+#
+# OCF Configuration
+#
+# CONFIG_OCF_OCF is not set
CONFIG_HAVE_KVM=y
# CONFIG_VIRTUALIZATION is not set
# CONFIG_BINARY_PRINTF is not set