projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
staging
/
Kconfig
diff --git
a/drivers/staging/Kconfig
b/drivers/staging/Kconfig
index 5589616082e723eb1284c206c28bebb5b97452c7..b5c3b3013037c0eccb099c9ccff17e4ac557d1eb 100644
(file)
--- a/
drivers/staging/Kconfig
+++ b/
drivers/staging/Kconfig
@@
-59,8
+59,6
@@
source "drivers/staging/wlan-ng/Kconfig"
source "drivers/staging/echo/Kconfig"
source "drivers/staging/echo/Kconfig"
-source "drivers/staging/poch/Kconfig"
-
source "drivers/staging/otus/Kconfig"
source "drivers/staging/rt2860/Kconfig"
source "drivers/staging/otus/Kconfig"
source "drivers/staging/rt2860/Kconfig"
@@
-113,6
+111,8
@@
source "drivers/staging/vme/Kconfig"
source "drivers/staging/rar_register/Kconfig"
source "drivers/staging/rar_register/Kconfig"
+source "drivers/staging/memrar/Kconfig"
+
source "drivers/staging/sep/Kconfig"
source "drivers/staging/iio/Kconfig"
source "drivers/staging/sep/Kconfig"
source "drivers/staging/iio/Kconfig"
@@
-127,19
+127,19
@@
source "drivers/staging/batman-adv/Kconfig"
source "drivers/staging/samsung-laptop/Kconfig"
source "drivers/staging/samsung-laptop/Kconfig"
-source "drivers/staging/s
trip
/Kconfig"
+source "drivers/staging/s
m7xx
/Kconfig"
-source "drivers/staging/
arlan
/Kconfig"
+source "drivers/staging/
dt3155
/Kconfig"
-source "drivers/staging/
wavelan
/Kconfig"
+source "drivers/staging/
dt3155v4l
/Kconfig"
-source "drivers/staging/
netwave
/Kconfig"
+source "drivers/staging/
crystalhd
/Kconfig"
-source "drivers/staging/
sm7xx
/Kconfig"
+source "drivers/staging/
cxt1e1
/Kconfig"
-source "drivers/staging/
dt3155
/Kconfig"
+source "drivers/staging/
ti-st
/Kconfig"
-source "drivers/staging/
crystalhd
/Kconfig"
+source "drivers/staging/
adis16255
/Kconfig"
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING
endif # !STAGING_EXCLUDE_BUILD
endif # STAGING