Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754624AbaFRTIt (ORCPT ); Wed, 18 Jun 2014 15:08:49 -0400 Received: from cpsmtpb-ews07.kpnxchange.com ([213.75.39.10]:60454 "EHLO cpsmtpb-ews07.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754253AbaFRTIr (ORCPT ); Wed, 18 Jun 2014 15:08:47 -0400 Message-ID: <1403118525.23136.2.camel@x220> Subject: Re: [PATCH] Remove CPU_SUBTYPE_SH7764 From: Paul Bolle To: Andrew Morton Cc: Richard Weinberger , Geert Uytterhoeven , linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 18 Jun 2014 21:08:45 +0200 In-Reply-To: <1403083935.1984.74.camel@x220> References: <1391971686-9517-1-git-send-email-richard@nod.at> <1391971686-9517-22-git-send-email-richard@nod.at> <1391981761.25855.58.camel@x220> <1397554747.1985.35.camel@x220> <1403083935.1984.74.camel@x220> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 18 Jun 2014 19:08:45.0888 (UTC) FILETIME=[BA609C00:01CF8B28] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2014-06-18 at 11:32 +0200, Paul Bolle wrote: > The symbol is an orphan, get rid of it. > > Signed-off-by: Richard Weinberger > [pebolle@tiscali.nl: re-added dropped ||] > Signed-off-by: Paul Bolle > --- > Submitted by Richard a few months ago as "[PATCH 21/28] Remove > CPU_SUBTYPE_SH7764". So I should have sent this with a From: Richard Weinberger first line. Let's hope Andrew notices it. Paul Bolle > Untested. > > arch/sh/drivers/dma/Kconfig | 5 ++--- > arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 - > arch/sh/include/cpu-sh4a/cpu/dma.h | 3 +-- > 3 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig > index cfd5b90a8628..78bc97b1d027 100644 > --- a/arch/sh/drivers/dma/Kconfig > +++ b/arch/sh/drivers/dma/Kconfig > @@ -12,9 +12,8 @@ config SH_DMA_IRQ_MULTI > default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ > CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \ > CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091 || \ > - CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \ > - CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || \ > - CPU_SUBTYPE_SH7760 > + CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7780 || \ > + CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7760 > > config SH_DMA_API > depends on SH_DMA > diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h > index 02788b6a03b7..9cd81e54056a 100644 > --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h > +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h > @@ -32,7 +32,6 @@ > #define CHCR_TS_HIGH_SHIFT (20 - 2) /* 2 bits for shifted low TS */ > #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \ > defined(CONFIG_CPU_SUBTYPE_SH7763) || \ > - defined(CONFIG_CPU_SUBTYPE_SH7764) || \ > defined(CONFIG_CPU_SUBTYPE_SH7780) || \ > defined(CONFIG_CPU_SUBTYPE_SH7785) > #define CHCR_TS_LOW_MASK 0x00000018 > diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h > index 89afb650ce25..8ceccceae844 100644 > --- a/arch/sh/include/cpu-sh4a/cpu/dma.h > +++ b/arch/sh/include/cpu-sh4a/cpu/dma.h > @@ -14,8 +14,7 @@ > #define DMTE4_IRQ evt2irq(0xb80) > #define DMAE0_IRQ evt2irq(0xbc0) /* DMA Error IRQ*/ > #define SH_DMAC_BASE0 0xFE008020 > -#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \ > - defined(CONFIG_CPU_SUBTYPE_SH7764) > +#elif defined(CONFIG_CPU_SUBTYPE_SH7763) > #define DMTE0_IRQ evt2irq(0x640) > #define DMTE4_IRQ evt2irq(0x780) > #define DMAE0_IRQ evt2irq(0x6c0) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/