From patchwork Thu Aug 13 08:49:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaswinder Singh Rajput X-Patchwork-Id: 31289 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 02C54B7B6D for ; Thu, 13 Aug 2009 18:50:58 +1000 (EST) Received: by ozlabs.org (Postfix) id DA8AADDD1B; Thu, 13 Aug 2009 18:50:57 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 37DF4DDD01 for ; Thu, 13 Aug 2009 18:50:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753749AbZHMIu2 (ORCPT ); Thu, 13 Aug 2009 04:50:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753752AbZHMIu2 (ORCPT ); Thu, 13 Aug 2009 04:50:28 -0400 Received: from hera.kernel.org ([140.211.167.34]:55377 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753751AbZHMIu1 (ORCPT ); Thu, 13 Aug 2009 04:50:27 -0400 Received: from [192.168.1.220] (triband-del-59.180.32.233.bol.net.in [59.180.32.233] (may be forged)) (authenticated bits=0) by hera.kernel.org (8.14.2/8.13.8) with ESMTP id n7D8oNIq022358 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 13 Aug 2009 08:50:27 GMT Subject: [RFC][PATCH] SPARC: fix duplicate declaration From: Jaswinder Singh Rajput To: David Miller , sparclinux@vger.kernel.org Date: Thu, 13 Aug 2009 14:19:47 +0530 Message-Id: <1250153387.6116.20.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-2.fc10) X-Virus-Scanned: ClamAV 0.93.3/9686/Thu Aug 13 02:10:26 2009 on hera.kernel.org X-Virus-Status: Clean Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Only difference for 32 and 64 bit version is dma64_addr_t and rest is same. Also fixed the following 'make includecheck' warning: arch/sparc/include/asm/types.h: asm-generic/int-ll64.h is included more than once. Signed-off-by: Jaswinder Singh Rajput --- arch/sparc/include/asm/types.h | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h index de671d7..09c79a9 100644 --- a/arch/sparc/include/asm/types.h +++ b/arch/sparc/include/asm/types.h @@ -8,9 +8,8 @@ * need to be careful to avoid a name clashes. */ -#if defined(__sparc__) && defined(__arch64__) +#if defined(__sparc__) -/*** SPARC 64 bit ***/ #include #ifndef __ASSEMBLY__ @@ -26,33 +25,21 @@ typedef unsigned short umode_t; /* Dma addresses come in generic and 64-bit flavours. */ typedef u32 dma_addr_t; -typedef u64 dma64_addr_t; -#endif /* __ASSEMBLY__ */ +#if defined(__arch64__) -#endif /* __KERNEL__ */ +/*** SPARC 64 bit ***/ +typedef u64 dma64_addr_t; #else - /*** SPARC 32 bit ***/ -#include - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - -#ifdef __KERNEL__ - -#ifndef __ASSEMBLY__ - -typedef u32 dma_addr_t; typedef u32 dma64_addr_t; +#endif /* defined(__arch64__) */ + #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ -#endif /* defined(__sparc__) && defined(__arch64__) */ +#endif /* defined(__sparc__) */ #endif /* defined(_SPARC_TYPES_H) */