diff --git a/[refs] b/[refs]
index 147e5d8f901b..7452952c4a0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5ecc192dfc5e0b325dd8c99ce4c755714c9acbf
+refs/heads/master: c1311af12c7ca176a790a911a3fb6fed1f3bb387
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 9f40eeff0b5c..0f3076a820c3 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -413,6 +413,8 @@ config IA64_PALINFO
 config SGI_SN
 	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
 
+source "drivers/sn/Kconfig"
+
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
index 5c91d6afb117..aeb5ab2391e4 100644
--- a/trunk/drivers/Kconfig
+++ b/trunk/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"