diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-02 19:50:47 +0200 |
| commit | 6f96b57ffa30d8e1bf6af9d1e9fae1902cb419e1 (patch) | |
| tree | 4ae705ebc844f4fc08e34e92af689cdb76475423 /target/linux/config/Config.in.systems | |
| parent | b7bbd7b3cf2d9f774464953fd2c42be9cabe790c (diff) | |
| parent | 64d1148c48e3cd428da42a5eb9bcda50f08171fb (diff) | |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.systems')
| -rw-r--r-- | target/linux/config/Config.in.systems | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index 5c420eb2b..24baa864e 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -35,6 +35,15 @@ config ADK_KERNEL_LEMOTE_MACH2F boolean # arm systems +config ADK_KERNEL_ARCH_PXA + boolean + +config ADK_KERNEL_PXA_SHARPSL + boolean + +config ADK_KERNEL_MACH_SPITZ + boolean + config ADK_KERNEL_ARCH_AT91 boolean |