Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752553Ab0DWI3N (ORCPT ); Fri, 23 Apr 2010 04:29:13 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:52107 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876Ab0DWI3J convert rfc822-to-8bit (ORCPT ); Fri, 23 Apr 2010 04:29:09 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=ELgFh0WuQfJhK6ix+yaFlIkg9jQggm6xDDOxK/6HKduNAb7N5APm0WlBv2lxhRQlag TkXRNVGog4QYvGIw0o8w1Y0DRdAJAPgXXnPXtp/xDkb13I2EJ5tjxz9yhG2TNJeGAjUf z6ZSpuiYd517krEp9PJgSQIfyJYL/bKPb26L8= MIME-Version: 1.0 In-Reply-To: <1270511567-18567-7-git-send-email-fujita.tomonori@lab.ntt.co.jp> References: <1270511567-18567-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> <1270511567-18567-7-git-send-email-fujita.tomonori@lab.ntt.co.jp> Date: Fri, 23 Apr 2010 10:29:04 +0200 X-Google-Sender-Auth: 123159403f7fae93 Message-ID: Subject: Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h From: Geert Uytterhoeven To: FUJITA Tomonori Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, Roman Zippel , "Linux/m68k" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1992 Lines: 63 On Tue, Apr 6, 2010 at 01:52, FUJITA Tomonori wrote: > Signed-off-by: FUJITA Tomonori > Cc: Geert Uytterhoeven > Cc: Roman Zippel > --- >  arch/m68k/include/asm/scatterlist.h |   16 +--------------- >  1 files changed, 1 insertions(+), 15 deletions(-) > > diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h > index e27ad90..175da06 100644 > --- a/arch/m68k/include/asm/scatterlist.h > +++ b/arch/m68k/include/asm/scatterlist.h > @@ -1,23 +1,9 @@ >  #ifndef _M68K_SCATTERLIST_H >  #define _M68K_SCATTERLIST_H > > -#include > - > -struct scatterlist { > -#ifdef CONFIG_DEBUG_SG > -       unsigned long sg_magic; > -#endif > -       unsigned long page_link; > -       unsigned int offset; > -       unsigned int length; > - > -       dma_addr_t dma_address; /* A place to hang host-specific addresses at. */ > -}; > +#include This include should be ... >  /* This is bogus and should go away. */ >  #define ISA_DMA_THRESHOLD (0x00ffffff) ... below this definition, else you get duplicate definition errors (and the wrong definition). > -#define sg_dma_address(sg)     ((sg)->dma_address) > -#define sg_dma_len(sg)         ((sg)->length) > - >  #endif /* !(_M68K_SCATTERLIST_H) */ > -- > 1.7.0 Will apply (incl. the fix). Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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/