From: Tony Lindgren <tony@atomide.com>
Date: Thu, 19 Jan 2006 19:12:27 +0000 (-0800)
Subject: ARM: OMAP: Manually merge drivers/Kconfig
X-Git-Tag: v2.6.16-omap1~125
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6aea20adecb31a38d6a911edc14718915e079a93;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Manually merge drivers/Kconfig

Manually merge drivers/Kconfig
---

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 5e1d8673ee8..f5e28dfd821 100644
--- 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