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 'x86/cpufeature' into irq/numa
[sfrench/cifs-2.6.git]
/
arch
/
h8300
/
Kconfig
diff --git
a/arch/h8300/Kconfig
b/arch/h8300/Kconfig
index 28f06fd9b7b709258b12d58737045f0b4c170412..9420648352b8bc7783594c2177e14da2443aaf45 100644
(file)
--- a/
arch/h8300/Kconfig
+++ b/
arch/h8300/Kconfig
@@
-220,6
+220,8
@@
source "drivers/uwb/Kconfig"
endmenu
+source "drivers/staging/Kconfig"
+
source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"