projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20160801' of git://git.infradead.org/linux-mtd
[cascardo/linux.git]
/
drivers
/
memory
/
Kconfig
diff --git
a/drivers/memory/Kconfig
b/drivers/memory/Kconfig
index
1337123
..
4b4c0c3
100644
(file)
--- a/
drivers/memory/Kconfig
+++ b/
drivers/memory/Kconfig
@@
-115,7
+115,7
@@
config FSL_CORENET_CF
config FSL_IFC
bool
- depends on FSL_SOC
+ depends on FSL_SOC
|| ARCH_LAYERSCAPE
config JZ4780_NEMC
bool "Ingenic JZ4780 SoC NEMC driver"