From patchwork Fri May 5 19:47:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98703 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292919qge; Fri, 5 May 2017 12:48:52 -0700 (PDT) X-Received: by 10.84.254.67 with SMTP id a3mr67402041pln.185.1494013732476; Fri, 05 May 2017 12:48:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.52; Fri, 05 May 2017 12:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755483AbdEETsv (ORCPT + 6 others); Fri, 5 May 2017 15:48:51 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:61012 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755674AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ljz90-1de95l0ND8-00cBap; Fri, 05 May 2017 21:48:35 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Tony Lindgren , Arnd Bergmann Subject: [PATCH 3.16-stable 76/87] ARM: OMAP: Fix Kconfig warning for omap1 Date: Fri, 5 May 2017 21:47:34 +0200 Message-Id: <20170505194745.3627137-77-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:XxYNck30pq0xtttV+FMvveVcaW1jDpCO+9BFVyLgMh/EBboHoCV Gd+c3TeDZlP9ppiWGOF7OUX2Q+mgj7dftCsaGY8P5PVDGsQVkaAHpm9+TVgxph4Hwt/XQJs jZWurB1KIePyIUPJWMPC9gLMrlWZJ5wYsShNgLMQxIZWFYPOCc53QOR2FAmqpEDZPjzE2h9 I5Nz1dEIrKc42nUVmVCXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cXFLC5F2VG4=:cLBaQ+8XWW1PiSO8gM54Jo gR6WGaT+FmiK71/JI6fc4Y4D3SofdNLS8jT65wGw6ZLm1IinE24EONTL0sYMCsBSDe1njLs3v v3Ky3/3Ad0tUV/uldu4szSAYWaEIKrAxeRT00KLsW5cjDtuCXkKs1bzNLLs8JmpDXC8NsrPFR A/0yH9zkXk04/X4rxc1eq4W6UsJIv1riy4XjZwogy0ZW2U1Wog0WKYNTOu73+yXWzd5NnXfzy VEoK+8+3kprBBhd97FUKRe9nFJqG+YBxyIwTWclSgECK5mlHhjstvDKRod5XxdPWtBMz4g3AB hRIWA0Q0qI6dhefeReHy/n6d6rzFzBqhRZMdOmcwMNCTee45gOCEWIhX/RW8VZ7CsnamflAYd J0H6W/vw+ZRiJ7zKVQzq5UkI2CotSpG9OlOX3hOuPqvNo1tQKsmX6zgh35UoxHXJq79xI3dfj xua2r2zEfsV5K+PZZS2LxXmD1rUMEIe1wI2z5iqnBHgxR5AECwEm1I6+EgjzYXVc++cf7d2h4 KNQ6McXNOhxyWD5DPd7zyABepmIRvQdgzlEbCEacTn4hF3dzb3yye8zzI+QF+N4sNKWjU+Suo qzIpjglrHZxmibnpoqGLgU83axxhJ38aSt8Sr670Yvp3cXu08dobu0nNPmDnVjM0x608W41Sx pr9qAibSDKXTVLeuPr31OG+9a8e3GrIqEBeRmi/V42Y1z8vw1BodDtruo3o6ZI3GjxHU= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tony Lindgren Commit f311f63369ac04993e69e36c7a1913cbf9f470ee upstream. Commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") improved the sub-arch menus, but accidentally caused new warnings for omap1. This was because the commit added a menu entry around config ARCH_OMAP bool entry where the menu had depends on ARCH_MULTI_V6 || ARCH_MULTI_V7. As ARCH_OMAP is shared between omap1 and omap2plus, let's fix the issue by defining ARCH_OMAP in the shared plat-omap/Kconfig. Fixes: 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") Reported-by: Andreas Ruprecht Signed-off-by: Tony Lindgren Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/Kconfig | 3 --- arch/arm/plat-omap/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 1c1ed737f7ab..3ac9cb2b2eb2 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -1,9 +1,6 @@ menu "TI OMAP/AM/DM/DRA Family" depends on ARCH_MULTI_V6 || ARCH_MULTI_V7 -config ARCH_OMAP - bool - config ARCH_OMAP2 bool "TI OMAP2" depends on ARCH_MULTI_V6 diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 02fc10d2d63b..d055db32ffcb 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -1,3 +1,6 @@ +config ARCH_OMAP + bool + if ARCH_OMAP menu "TI OMAP Common Features"