From patchwork Tue Nov 27 05:59:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1808631 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 307CEDF254 for ; Tue, 27 Nov 2012 06:00:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349Ab2K0F7y (ORCPT ); Tue, 27 Nov 2012 00:59:54 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:62329 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890Ab2K0F7y (ORCPT ); Tue, 27 Nov 2012 00:59:54 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so5666874pad.19 for ; Mon, 26 Nov 2012 21:59:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=6CxepgI6Iyxf0mTzvOdHn8fJflWfKRCB6/pLCDikuB4=; b=QfxAn9LspQkfiRnLraAZPSvlvDYz1pEx9VA3qJ+r+LWJrnacE35e/CpLPD0HzwlCDw 21b7HtyqTL55FIS/22FRWaEJr35UlWQmK1YzkOAx4rF6YU0AXK6+uwMrdFCtputCZu69 x9ZWo5XKUMwep/zLaOjg1Hjt25YfinaVkNuEtHnEBsGkXLCIIjgN+aF/I0NCVRAOqwBc PXhWDhOE7j9ym3YCnMn9CEA5qYrpoMGULpgrfR826g/ILe78Xm25Cz0Nkah6QbgvEA48 G8GV/K+PlLPw6FwiZ2FTOVHanf6MhM7CbQrl0znvdWqmK3+JjqRpBPH9FCuZlyXADMHq R0IQ== Received: by 10.68.193.167 with SMTP id hp7mr45712187pbc.124.1353995993698; Mon, 26 Nov 2012 21:59:53 -0800 (PST) Received: from localhost.localdomain ([122.166.104.238]) by mx.google.com with ESMTPS id pv8sm10054450pbc.26.2012.11.26.21.59.50 (version=SSLv3 cipher=OTHER); Mon, 26 Nov 2012 21:59:52 -0800 (PST) From: Prabhakar Lad To: LMML Cc: LKML , Mauro Carvalho Chehab , Kyungmin Park , Marek Szyprowski , Pawel Osciak , "Lad, Prabhakar" , Manjunath Hadli Subject: [PATCH] media: fix a typo CONFIG_HAVE_GENERIC_DMA_COHERENT in videobuf2-dma-contig.c Date: Tue, 27 Nov 2012 11:29:39 +0530 Message-Id: <1353995979-28792-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- 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,