Message ID | 1394794553-14719-1-git-send-email-denis@eukrea.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 14/03/14 12:55, Denis Carikli wrote: > The following patch: > b359bb0 video: Kconfig: Allow more broad selection of the imxfb framebuffer driver. > Was accidentally reverted by this one: > ed3b5f2 Merge branch '3.15/fb-reorder' into for-next > > Signed-off-by: Denis Carikli <denis@eukrea.com> Thanks. I've fixed it. It was my merge mistake. Tomi
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 67409e0..45fd7f3 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -327,7 +327,7 @@ config FB_SA1100 config FB_IMX tristate "Freescale i.MX1/21/25/27 LCD support" - depends on FB && IMX_HAVE_PLATFORM_IMX_FB + depends on FB && ARCH_MXC select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT
The following patch: b359bb0 video: Kconfig: Allow more broad selection of the imxfb framebuffer driver. Was accidentally reverted by this one: ed3b5f2 Merge branch '3.15/fb-reorder' into for-next Signed-off-by: Denis Carikli <denis@eukrea.com> --- ChangeLog v14->v15: - New patch --- drivers/video/fbdev/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)