diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:40:10 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 14:40:10 (GMT) |
| commit | 01731cf2eee38410b505c447026e46a591674835 (patch) | |
| tree | eeaea94786b4ca993dd3a40d123eb3b6799da1c9 /drivers/staging/imx-drm | |
| parent | 6496c045292b7afe74b5306c123186976f032125 (diff) | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) | |
| download | linux-fsl-qoriq-01731cf2eee38410b505c447026e46a591674835.tar.xz | |
Merge 3.11-rc3 into staging-next
We want these fixes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig index 6156e3f..0f75afc 100644 --- a/drivers/staging/imx-drm/Kconfig +++ b/drivers/staging/imx-drm/Kconfig @@ -33,7 +33,6 @@ config DRM_IMX_TVE config DRM_IMX_LDB tristate "Support for LVDS displays" depends on DRM_IMX - select OF_VIDEOMODE help Choose this to enable the internal LVDS Display Bridge (LDB) found on i.MX53 and i.MX6 processors. |