summaryrefslogtreecommitdiff
path: root/target/linux/config/Config.in.systems
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-09-16 11:07:13 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-09-16 11:07:13 +0200
commit5861b2783c0615345b80a93470312b36d1cb9907 (patch)
tree42ded4821e0834063449a5620a1b46bc6f1e509b /target/linux/config/Config.in.systems
parente3d296fa18ef060fad7e654cd9308e57ffd0934b (diff)
parentd8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff)
fix conflict
Diffstat (limited to 'target/linux/config/Config.in.systems')
-rw-r--r--target/linux/config/Config.in.systems3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems
index 3e64caddc..248958bbd 100644
--- a/target/linux/config/Config.in.systems
+++ b/target/linux/config/Config.in.systems
@@ -38,6 +38,9 @@ config ADK_KERNEL_LEMOTE_MACH2F
config ADK_KERNEL_ARCH_VERSATILE
boolean
+config ADK_KERNEL_PXA_SHARP_Cxx00
+ boolean
+
config ADK_KERNEL_ARCH_PXA
boolean