summaryrefslogtreecommitdiff
path: root/target/config/Config.in.kernelversion
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 16:39:17 +0200
commit2735fdf97305e110eba8e776f8728a52ae886c05 (patch)
tree0ce26ce1066bd7260625ca641b1e64c99015f47f /target/config/Config.in.kernelversion
parent65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff)
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.kernelversion')
-rw-r--r--target/config/Config.in.kernelversion6
1 files changed, 6 insertions, 0 deletions
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
new file mode 100644
index 000000000..e87c1ab67
--- /dev/null
+++ b/target/config/Config.in.kernelversion
@@ -0,0 +1,6 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+source target/config/Config.in.kernelversion.choice
+source target/config/Config.in.kernelversion.default
+