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/linux | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.kernel | 6 |
1 files changed, 6 insertions, 0 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 "" |