From patchwork Thu Mar 4 16:54:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 83655 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o24Gt0Ys018739 for ; Thu, 4 Mar 2010 16:55:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756044Ab0CDQy7 (ORCPT ); Thu, 4 Mar 2010 11:54:59 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:51997 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755375Ab0CDQy6 (ORCPT ); Thu, 4 Mar 2010 11:54:58 -0500 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.69) (envelope-from ) id 1NnEK3-0004ur-E8; Thu, 04 Mar 2010 17:54:51 +0100 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1NnEK3-00058D-1W; Thu, 04 Mar 2010 17:54:51 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-media@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Mauro Carvalho Chehab , Guennadi Liakhovetski , Antonio Ospite , Sascha Hauer , Hans Verkuil , linux-kernel@vger.kernel.org Subject: [PATCH] V4L/DVB: mx1-camera: compile fix Date: Thu, 4 Mar 2010 17:54:46 +0100 Message-Id: <1267721687-19697-1-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Mar 2010 16:55:00 +0000 (UTC) diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index 2ba14fb..38e5315 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c @@ -45,6 +45,9 @@ #include #include +#undef DMA_BASE +#define DMA_BASE MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR) + /* * CSI registers */ @@ -783,7 +786,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) pcdev); imx_dma_config_channel(pcdev->dma_chan, IMX_DMA_TYPE_FIFO, - IMX_DMA_MEMSIZE_32, DMA_REQ_CSI_R, 0); + IMX_DMA_MEMSIZE_32, MX1_DMA_REQ_CSI_R, 0); /* burst length : 16 words = 64 bytes */ imx_dma_config_burstlen(pcdev->dma_chan, 0);