projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-block.git]
/
drivers
/
video
/
Kconfig
diff --git
a/drivers/video/Kconfig
b/drivers/video/Kconfig
index 76be61701c9766023c36c4184c06776bed26ef74..ab5ba3d49e1445d3e30b67be73471a103b90f70d 100644
(file)
--- a/
drivers/video/Kconfig
+++ b/
drivers/video/Kconfig
@@
-21,6
+21,8
@@
source "drivers/gpu/vga/Kconfig"
source "drivers/gpu/drm/Kconfig"
+source "drivers/gpu/host1x/Kconfig"
+
config VGASTATE
tristate
default n