From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933498Ab0HJWDs (ORCPT ); Tue, 10 Aug 2010 18:03:48 -0400 Received: from kroah.org ([198.145.64.141]:45045 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933481Ab0HJWAt (ORCPT ); Tue, 10 Aug 2010 18:00:49 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Christoph Egger , Andrew Morton , Greg Kroah-Hartman Subject: [PATCH 58/68] serial: 68328serial.c: remove dead (ALMA_ANS | DRAGONIXVZ | M68EZ328ADS) Date: Tue, 10 Aug 2010 14:59:20 -0700 Message-Id: <1281477570-18944-58-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20100810214425.GB17385@kroah.com> References: <20100810214425.GB17385@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Egger (ALMA_ANS | DRAGONIXVZ | M68EZ328ADS) doesn't exist in Kconfig, therefore remove all references to it from the source code. Signed-off-by: Christoph Egger Acked-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/serial/68328serial.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index d8204f4..7356a56 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -98,19 +98,13 @@ static void change_speed(struct m68k_serial *info); * Setup for console. Argument comes from the boot command line. */ -#if defined(CONFIG_M68EZ328ADS) || defined(CONFIG_ALMA_ANS) || defined(CONFIG_DRAGONIXVZ) -#define CONSOLE_BAUD_RATE 115200 -#define DEFAULT_CBAUD B115200 -#else - /* (es) */ - /* note: this is messy, but it works, again, perhaps defined somewhere else?*/ - #ifdef CONFIG_M68VZ328 - #define CONSOLE_BAUD_RATE 19200 - #define DEFAULT_CBAUD B19200 - #endif - /* (/es) */ +/* note: this is messy, but it works, again, perhaps defined somewhere else?*/ +#ifdef CONFIG_M68VZ328 +#define CONSOLE_BAUD_RATE 19200 +#define DEFAULT_CBAUD B19200 #endif + #ifndef CONSOLE_BAUD_RATE #define CONSOLE_BAUD_RATE 9600 #define DEFAULT_CBAUD B9600 -- 1.7.2