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 tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd
[sfrench/cifs-2.6.git]
/
lib
/
Kconfig
diff --git
a/lib/Kconfig
b/lib/Kconfig
index a2b6745324ab358a5685ccb6ce690a4f64a8b809..c5e84fbcb30b7562656dcbbc050bcc0ec4cb7a90 100644
(file)
--- a/
lib/Kconfig
+++ b/
lib/Kconfig
@@
-46,10
+46,6
@@
config GENERIC_IOMAP
bool
select GENERIC_PCI_IOMAP
-config GENERIC_IO
- bool
- default n
-
config STMP_DEVICE
bool
@@
-584,7
+580,7
@@
config PRIME_NUMBERS
tristate
config STRING_SELFTEST
-
bool
"Test string functions"
+
tristate
"Test string functions"
endmenu