diff --git a/[refs] b/[refs]
index 94e5d06b8c3e..add133902346 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae105879f2f2404155da6f50b3636193d228a62
+refs/heads/master: 797d799ed09bbbfd13f684756bccafbbd44ffcd0
diff --git a/trunk/arch/arm/mach-davinci/Kconfig b/trunk/arch/arm/mach-davinci/Kconfig
index 006144401c95..89d5aa7d43a7 100644
--- a/trunk/arch/arm/mach-davinci/Kconfig
+++ b/trunk/arch/arm/mach-davinci/Kconfig
@@ -130,22 +130,18 @@ config MACH_DAVINCI_DA850_EVM
 	bool "TI DA850/OMAP-L138 Reference Platform"
 	default ARCH_DAVINCI_DA850
 	depends on ARCH_DAVINCI_DA850
-	help
-	  Say Y here to select the TI DA850/OMAP-L138 Evaluation Module.
-
-config DA850_UI_EXP
-	bool "DA850/OMAP-L138 UI (User Interface) board expander configuration"
-	depends on MACH_DAVINCI_DA850_EVM
 	select GPIO_PCA953X
 	help
-	  Say Y here if you have the DA850/OMAP-L138 UI
-	  (User Interface) board installed and you want to
-	  enable the peripherals located on User Interface
-	  board contorlled by TCA6416 expander.
+	  Say Y here to select the TI DA850/OMAP-L138 Evaluation Module.
 
 choice
 	prompt "Select peripherals connected to expander on UI board"
-	depends on DA850_UI_EXP
+	depends on MACH_DAVINCI_DA850_EVM
+	help
+	  The presence of User Interface (UI) card on the DA850/OMAP-L138
+	  EVM is detected automatically based on successful probe of the I2C
+	  based GPIO expander on that card. This option selected in this
+	  menu has an effect only in case of a successful UI card detection.
 
 config DA850_UI_NONE
 	bool "No peripheral is enabled"