diff --git a/[refs] b/[refs] index 9c20b47607fc..03fa7f86e1b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf2585a482e0ac83ab11928699c292d73c128fd6 +refs/heads/master: e45f265e7ea3ee6de24efe91fe2928d603cb1741 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 714d32a279e2..8bda6131ae3e 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -1777,8 +1777,7 @@ config FB_VT8500 select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT select FB_MODE_HELPERS - select OF_DISPLAY_TIMING - select OF_VIDEOMODE + select VIDEOMODE_HELPERS help This is the framebuffer driver for VIA VT8500 integrated LCD controller. @@ -1790,8 +1789,7 @@ config FB_WM8505 select FB_SYS_COPYAREA if (!FB_WMT_GE_ROPS) select FB_SYS_IMAGEBLIT select FB_MODE_HELPERS - select OF_DISPLAY_TIMING - select OF_VIDEOMODE + select VIDEOMODE_HELPERS help This is the framebuffer driver for WonderMedia WM8xxx-series integrated LCD controller. This driver covers the WM8505, WM8650