aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
committerMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
commite9b3bd248b349433215cf01064a866b632fb3f4b (patch)
tree9821327345bdced3d895723cba1181d7ca399aca /drivers/video
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent80475b849b90d8bed1fe768c496280f4b5c11410 (diff)
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2e937bdace6..da4766b456f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -23,6 +23,8 @@ source "drivers/gpu/drm/Kconfig"
source "drivers/gpu/host1x/Kconfig"
+source "drivers/gpu/ion/Kconfig"
+
config VGASTATE
tristate
default n