ARM: OMAP: Manually merge drivers/Kconfig

Manually merge drivers/Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 5e1d8673ee8263f82ee4c9e924a92718fec0a89e..f5e28dfd8218bf6785763b1a6c3d1342250c39f1 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/infiniband/Kconfig"
 
 source "drivers/sn/Kconfig"
 
+source "drivers/edac/Kconfig"
+
 source "drivers/ssi/Kconfig"
 
 endmenu