Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 5c91d6afb11739708b6ece4e9c0424dedf044982..aeb5ab2391e421faf03935992ffa3c0c817f4353 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,8 +68,6 @@ source "drivers/leds/Kconfig"
 
 source "drivers/infiniband/Kconfig"
 
-source "drivers/sn/Kconfig"
-
 source "drivers/edac/Kconfig"
 
 source "drivers/rtc/Kconfig"