From patchwork Mon Apr 25 13:13:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102472 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1031291qge; Mon, 25 Apr 2016 06:14:54 -0700 (PDT) X-Received: by 10.98.72.16 with SMTP id v16mr19926676pfa.12.1461590094291; Mon, 25 Apr 2016 06:14:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g1si9554273pfd.0.2016.04.25.06.14.53; Mon, 25 Apr 2016 06:14:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754665AbcDYNOw (ORCPT + 29 others); Mon, 25 Apr 2016 09:14:52 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:55397 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754296AbcDYNOu (ORCPT ); Mon, 25 Apr 2016 09:14:50 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue001) with ESMTPA (Nemesis) id 0Ly6OT-1bpGoQ2pDJ-015buF; Mon, 25 Apr 2016 15:13:31 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Wei Xu , Haojian Zhuang , Jiancheng Xue , Haifeng Yan , Olof Johansson , Arnd Bergmann , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: debug: remove extraneous DEBUG_HI3716_UART option Date: Mon, 25 Apr 2016 15:13:10 +0200 Message-Id: <1461590006-1395429-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:xXb0HVlCfeimEyqbxouZP6s+KjwgW+fay5o3zMU9141geNoMjGX ByvFOLTJ3WJu4TAY76UIW9mUTNiEakOxtbgCfL/J4ESBB9fPuejte9ec4Mpq+dZpMUmstFO 3KTtb29N9MW0MrHY10JZNFl5Sz3GXADt5EB6hIDvYIF+2lh+ZhbBlbPy0fWdfj/OH6muGu0 9atw5j9yXAg6aK0Wp7aXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:BUtCPHqm21A=:JI0zrWbYhkHAJ0Z71hOoi3 GXNE3S3xpjprY44wGk0ArBY84sn8UZBr3JCEaBI9hDzOgjLercVB+bamGEWElKqpsno42EyAk Sur9BZbULW/H05qJ1GnHHIv/d00nj05WSrW1xvNG/L55LQPRq9wQgO1yLHBcYNqo7KERN4n5g NI+vnKP6gAu/z1mbkpfRvhO3/4kQ2NwF9KnBQfqrvYcQOwiz+5/Pzay/tmg63nb5sJJS50UxA Cff0b2Xw0xfDU9CEpfPvLOBsf5+j8HbZACeP3a3jZS1KYdp/C69D4XzohqrWPJUQpvcUy6SgH vFJQaZmvy/7CV+/HE3aQmcbWz6O3tmd3fy4YTCyr77q4K0Yt6uUW7t1q3ugtx/8WTB0n2KeGA HeKhpPtTox9U7svJakULUPplp0QoRmDeRJoi7fRxgNWJ/vOeL5ge0qBmnqCOdKx2IKKd94Tka jlMP1UQd3Gwc0VjReh+cV9VzngFAQzu25imOBh82zhWKfJnICz0cfbblov/Y6/6YX64gXzAwi xEkUUQ0JRBn2FD62CQBdcWxLBVnhf96LCEaezhaq8M343k/Jzqs7LloGyBmoSzyr7wJjLxR3Q pUDaQetBBst1c/p9mZoBg9YLOrdH5fz5+V/Vso3wg321d+C0/V0feIviydaETdSVS0VK/NkRm sWyjFEDBBjX/iijmcEuxH+GLTH7T3eGfoU7vw1eWa6Q648h3VtmHxO8HdbHA6XAwidSI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DEBUG_HI3716_UART was supposed to be renamed to DEBUG_HIX5HD2_UART, but accidentally both got left in place, which results in a build error when CONFIG_DEBUG_UART_PHYS is not set as it should be. This removes the old symbol. Signed-off-by: Arnd Bergmann Fixes: 12aae3097454 ("ARM: debug: Rename Hi3716 to HIX5HD2") --- arch/arm/Kconfig.debug | 8 -------- 1 file changed, 8 deletions(-) -- 2.7.0 diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 6993978cfd6f..2afd38766707 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -268,14 +268,6 @@ choice Say Y here if you want kernel low-level debugging support on HI3620 UART. - config DEBUG_HI3716_UART - bool "Hisilicon Hi3716 Debug UART" - depends on ARCH_HI3xxx - select DEBUG_UART_PL01X - help - Say Y here if you want kernel low-level debugging support - on HI3716 UART. - config DEBUG_HIGHBANK_UART bool "Kernel low-level debugging messages via Highbank UART" depends on ARCH_HIGHBANK