Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 709488ae882e2dfd2e0d5edcf6e1bc021f84dbc1..d2ac339de85fa52a262e372bb483b679601c482b 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,6 +18,8 @@ source "drivers/pnp/Kconfig"
 
 source "drivers/block/Kconfig"
 
+source "drivers/nvme/Kconfig"
+
 # misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
 
 source "drivers/misc/Kconfig"
@@ -42,6 +44,8 @@ source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
+source "drivers/lightnvm/Kconfig"
+
 # input before char - char/joystick depends on it. As does USB.
 
 source "drivers/input/Kconfig"
@@ -192,4 +196,6 @@ source "drivers/hwtracing/stm/Kconfig"
 
 source "drivers/hwtracing/intel_th/Kconfig"
 
+source "drivers/fpga/Kconfig"
+
 endmenu