diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
| commit | 033e30653835c5c3fc785ab60e6a110203e6241d (patch) | |
| tree | fbb575df1204e3d44fd1262af721bae206fc848e /target/linux/config | |
| parent | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff) | |
resolve merge
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.graphics | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 847a0853d..79e558491 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -155,7 +155,7 @@ config ADK_KERNEL_DRM_IMX select ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY select ADK_KERNEL_I2C_IMX depends on ADK_TARGET_SYSTEM_CUBOX_I - depends on ADK_KERNEL_VERSION_3_15_RC5 + depends on ADK_KERNEL_VERSION_3_15_RC6 default y if ADK_TARGET_SYSTEM_CUBOX_I default n help |