Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758221Ab2K0HXw (ORCPT ); Tue, 27 Nov 2012 02:23:52 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:14798 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758140Ab2K0HXu (ORCPT ); Tue, 27 Nov 2012 02:23:50 -0500 Message-id: <50B46A83.8020703@samsung.com> Date: Tue, 27 Nov 2012 08:23:47 +0100 From: Marek Szyprowski User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-version: 1.0 To: Prabhakar Lad Cc: LMML , LKML , Mauro Carvalho Chehab , Kyungmin Park , Pawel Osciak , "Lad, Prabhakar" , Manjunath Hadli Subject: Re: [PATCH] media: fix a typo CONFIG_HAVE_GENERIC_DMA_COHERENT in videobuf2-dma-contig.c References: <1353995979-28792-1-git-send-email-prabhakar.lad@ti.com> In-reply-to: <1353995979-28792-1-git-send-email-prabhakar.lad@ti.com> Content-type: text/plain; charset=UTF-8; format=flowed Content-transfer-encoding: 7bit X-TM-AS-MML: No Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2006 Lines: 51 Hello, On 11/27/2012 6:59 AM, Prabhakar Lad wrote: > From: Lad, Prabhakar > > from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds > a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly > made it should have been HAVE_GENERIC_DMA_COHERENT but it was > CONFIG_HAVE_GENERIC_DMA_COHERENT. > This patch fixes the typo, which was causing following build error: > > videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here (not in a function) > make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1 > > Signed-off-by: Lad, Prabhakar > Signed-off-by: Manjunath Hadli The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround for the build problem in linux-next and should be reverted now. The correct patch has been posted for drivers/base/dma-mapping.c to LKML, see http://www.spinics.net/lists/linux-next/msg22890.html > --- > drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c > index 5729450..dfea692 100644 > --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c > +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c > @@ -739,7 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf, > const struct vb2_mem_ops vb2_dma_contig_memops = { > .alloc = vb2_dc_alloc, > .put = vb2_dc_put, > -#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT > +#ifdef HAVE_GENERIC_DMA_COHERENT > .get_dmabuf = vb2_dc_get_dmabuf, > #endif > .cookie = vb2_dc_cookie, Best regards -- Marek Szyprowski Samsung Poland R&D Center -- 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/