From 033e30653835c5c3fc785ab60e6a110203e6241d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 23 May 2014 12:05:38 +0200 Subject: resolve merge --- target/linux/config/Config.in.graphics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/config/Config.in.graphics') 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 -- cgit v1.2.3