diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /target/x86 | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/kernel.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/x86/kernel.config b/target/x86/kernel.config index 639656f5b..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 -# Sun Aug 7 16:01:05 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 |