projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'locking/urgent' into locking/core, to pick up fixes
[linux-2.6-microblaze.git]
/
lib
/
Kconfig.debug
diff --git
a/lib/Kconfig.debug
b/lib/Kconfig.debug
index
e068c3c
..
0c781f9
100644
(file)
--- a/
lib/Kconfig.debug
+++ b/
lib/Kconfig.debug
@@
-520,8
+520,8
@@
config DEBUG_FS_ALLOW_NONE
endchoice
source "lib/Kconfig.kgdb"
-
source "lib/Kconfig.ubsan"
+source "lib/Kconfig.kcsan"
endmenu
@@
-1620,8
+1620,6
@@
config PROVIDE_OHCI1394_DMA_INIT
source "samples/Kconfig"
-source "lib/Kconfig.kcsan"
-
config ARCH_HAS_DEVMEM_IS_ALLOWED
bool