summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-12-27 13:11:39 -0800
committerOlof Johansson <olof@lixom.net>2013-12-27 13:11:39 -0800
commit4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70 (patch)
treec06cf37e40d0233250e30973e6e2d35c52c1a944 /arch/arm
parent65f9c1312c23e5646414659797b8790d779a2445 (diff)
parentcb99fd620045c0a85593d52b7b1084fa69248b5e (diff)
downloadop-kernel-dev-4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70.zip
op-kernel-dev-4d77ce6c1fcae189dcd6fb0c7342f1c901b50a70.tar.gz
Merge tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards
From Stephen Warren: ARM: tegra: second set of defconfig changes This branch contains changes to tegra_defconfig that came in after I sent the previous pull-request/tag tegra-for-3.14-defconfig. We enable: * DRM_PANEL/DRM_PANEL_SIMPLE, which implements the built-in LCD panel support for Harmony, Cardhu, and Dalmore. This branch is based on tag tegra-for-3.14-defconfig, for which I sent a previous pull request. * tag 'tegra-for-3.14-defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Enable DRM panel support Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/tegra_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 1bbaaf8..e386538 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -168,6 +168,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=m
CONFIG_DRM=y
+CONFIG_DRM_PANEL=y
+CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_TEGRA=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
OpenPOWER on IntegriCloud