projects
/
cascardo
/
linux.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
[cascardo/linux.git]
/
drivers
/
staging
/
Kconfig
diff --git
a/drivers/staging/Kconfig
b/drivers/staging/Kconfig
index
3a7965d
..
093f10c
100644
(file)
--- a/
drivers/staging/Kconfig
+++ b/
drivers/staging/Kconfig
@@
-112,8
+112,6
@@
source "drivers/staging/media/Kconfig"
source "drivers/staging/net/Kconfig"
-source "drivers/staging/omapdrm/Kconfig"
-
source "drivers/staging/android/Kconfig"
source "drivers/staging/ozwpan/Kconfig"