From 5dcb6c8c28daafaab01d10a390a04a78f870faff Mon Sep 17 00:00:00 2001
From: Vineet Gupta <vgupta@synopsys.com>
Date: Fri, 18 Jan 2013 15:12:25 +0530
Subject: [PATCH] --- yaml --- r: 360174 b: refs/heads/master c:
 53d98958f585517f362733a1dbdb69e2dc5153a3 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arc/Kconfig              | 6 ++----
 trunk/arch/arc/plat-arcfpga/Kconfig | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 5bb9ec1e1249..1650e255d7a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4368902bb90f0e208387f336c3fce0e6b2a110fc
+refs/heads/master: 53d98958f585517f362733a1dbdb69e2dc5153a3
diff --git a/trunk/arch/arc/Kconfig b/trunk/arch/arc/Kconfig
index 2dab40dd8161..3fdd6a53e5d6 100644
--- a/trunk/arch/arc/Kconfig
+++ b/trunk/arch/arc/Kconfig
@@ -82,9 +82,7 @@ source "kernel/Kconfig.freezer"
 
 menu "ARC Architecture Configuration"
 
-choice
-	prompt "ARC Platform"
-	default ARC_PLAT_FPGA_LEGACY
+menu "ARC Platform/SoC"
 
 config ARC_PLAT_FPGA_LEGACY
 	bool "\"Legacy\" ARC FPGA dev platform"
@@ -96,7 +94,7 @@ config ARC_PLAT_FPGA_LEGACY
 	  - MetaWare ISS
 
 #New platform adds here
-endchoice
+endmenu
 
 menu "ARC CPU Configuration"
 
diff --git a/trunk/arch/arc/plat-arcfpga/Kconfig b/trunk/arch/arc/plat-arcfpga/Kconfig
index 9912d9c107a0..ae2c017151fa 100644
--- a/trunk/arch/arc/plat-arcfpga/Kconfig
+++ b/trunk/arch/arc/plat-arcfpga/Kconfig
@@ -8,8 +8,7 @@
 
 if ARC_PLAT_FPGA_LEGACY
 
-choice
-	prompt "FPGA Board"
+menu "FPGA Board"
 
 config ARC_BOARD_ANGEL4
 	bool "ARC Angel4"
@@ -35,7 +34,7 @@ config ISS_SMP_EXTN
 	  -XTL (To enable CPU start/stop/set-PC for another CPU)
 	  It doesn't provide coherent Caches and/or Atomic Ops (LLOCK/SCOND)
 
-endchoice
+endmenu
 
 config ARC_SERIAL_BAUD
 	int "UART Baud rate"