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 remote branch 'korg/drm-vmware-staging' into drm-core-next
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
Kconfig
diff --git
a/drivers/staging/Kconfig
b/drivers/staging/Kconfig
index da74e216b71d89ec5e930ccee4a68050f5ae91c4..9533ab60cdb576bed5498c6c8a86ae73f8721618 100644
(file)
--- a/
drivers/staging/Kconfig
+++ b/
drivers/staging/Kconfig
@@
-101,6
+101,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"