From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2005 13:39:40 +0000 (-0700)
Subject: ARM: OMAP: Manually merged drivers/Kconfig
X-Git-Tag: v2.6.13-omap1~104
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f09739ffb0cfa6c3082bddbed40729ccf26a39c;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Manually merged drivers/Kconfig

Manually merged drivers/Kconfig
---

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9041f180edc..be5e5fa6573 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -58,6 +58,8 @@ source "drivers/mmc/Kconfig"
 
 source "drivers/infiniband/Kconfig"
 
+source "drivers/sn/Kconfig"
+
 source "drivers/ssi/Kconfig"
 
 endmenu