diff --git a/[refs] b/[refs]
index d8ea26c75f7a..ba85d6dc8194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4
+refs/heads/master: bfe9c8ae114009491f51452ec727667d516ee79f
diff --git a/trunk/arch/arm/plat-omap/Kconfig b/trunk/arch/arm/plat-omap/Kconfig
index e289dd279783..f419a082b04b 100644
--- a/trunk/arch/arm/plat-omap/Kconfig
+++ b/trunk/arch/arm/plat-omap/Kconfig
@@ -26,7 +26,7 @@ config ARCH_OMAP2PLUS
 	select GENERIC_IRQ_CHIP
 	select OMAP_DM_TIMER
 	select USE_OF
-	select PROC_DEVICETREE
+	select PROC_DEVICETREE if PROC_FS
 	help
 	  "Systems based on OMAP2, OMAP3 or OMAP4"