git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
Kconfig
diff --git
a/drivers/staging/Kconfig
b/drivers/staging/Kconfig
index 54e174d28234600c49f8845f94c6fcfb7162aa03..093f57af32d3d9614973372af2e6abce81268706 100644
(file)
--- a/
drivers/staging/Kconfig
+++ b/
drivers/staging/Kconfig
@@
-99,6
+99,8
@@
source "drivers/staging/p9auth/Kconfig"
source "drivers/staging/line6/Kconfig"
+source "drivers/gpu/drm/vmwgfx/Kconfig"
+
source "drivers/gpu/drm/radeon/Kconfig"
source "drivers/gpu/drm/nouveau/Kconfig"