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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[sfrench/cifs-2.6.git]
/
arch
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index b17aeea8d620c2ce4b0776ee06c0ba27a8fc3488..3462245fe9fbf1e72ba496c81b76b754cd6f050a 100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-681,6
+681,8
@@
source "drivers/usb/Kconfig"
source "drivers/uwb/Kconfig"
+source "drivers/staging/Kconfig"
+
source "arch/cris/Kconfig.debug"
source "security/Kconfig"