From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755339AbaCDRSU (ORCPT ); Tue, 4 Mar 2014 12:18:20 -0500 Received: from mail-ig0-f176.google.com ([209.85.213.176]:52860 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275AbaCDRRz (ORCPT ); Tue, 4 Mar 2014 12:17:55 -0500 From: Soren Brinkmann To: Russell King , Greg Kroah-Hartman , Jiri Slaby Cc: Michal Simek , Peter Crosthwaite , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Olof Johansson , Arnd Bergmann , Kevin Hilman , Soren Brinkmann Subject: [PATCH RFC 6/6] ARM: multi_v7_defconfig: Adopt to UART driver renaming Date: Tue, 4 Mar 2014 09:17:29 -0800 Message-Id: <1393953449-28551-7-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.0.1.g4196000 In-Reply-To: <1393953449-28551-1-git-send-email-soren.brinkmann@xilinx.com> References: <1393953449-28551-1-git-send-email-soren.brinkmann@xilinx.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Xilinx UARTPS driver has been renamed to Cadence UART. Remove the stale Xilinx UARTPS config options and add Cadence UART instead. Signed-off-by: Soren Brinkmann Acked-by: Peter Crosthwaite --- arch/arm/configs/multi_v7_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ee6982976d66..4054c97a97e8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -151,8 +151,8 @@ CONFIG_SERIAL_VT8500_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +CONFIG_SERIAL_CADENCE_UART=y +CONFIG_SERIAL_CADENCE_UART_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_SERIAL_ST_ASC=y -- 1.9.0.1.g4196000