summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-05-24 18:30:15 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-05-24 18:30:15 +0200
commit754451342fc5954061ede74b0a8485ec4a4c6eaa (patch)
tree82daccba5779de492631c42e47a614bd9d4cddd2 /drivers/mtd/Kconfig
parentInput: psmouse-smbus - allow to control psmouse_deactivate (diff)
parentLinux 4.17-rc6 (diff)
downloadlinux-754451342fc5954061ede74b0a8485ec4a4c6eaa.tar.xz
linux-754451342fc5954061ede74b0a8485ec4a4c6eaa.zip
Merge tag 'v4.17-rc6' into next
Sync up with mainline to bring in Atmel controller changes for Caroline.
Diffstat (limited to 'drivers/mtd/Kconfig')
-rw-r--r--drivers/mtd/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 2a8ac6829d42..46ab7feec6b6 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -333,8 +333,6 @@ source "drivers/mtd/devices/Kconfig"
source "drivers/mtd/nand/Kconfig"
-source "drivers/mtd/onenand/Kconfig"
-
source "drivers/mtd/lpddr/Kconfig"
source "drivers/mtd/spi-nor/Kconfig"