From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: linux-next: build failure after merge of the v4l-dvb tree Date: Fri, 10 Apr 2015 15:45:11 +0300 Message-ID: <2431868.FjHG917i2e@avalon> References: <20150410201143.4adb51b0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:42605 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755628AbbDJMoq (ORCPT ); Fri, 10 Apr 2015 08:44:46 -0400 In-Reply-To: <20150410201143.4adb51b0@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Mauro Carvalho Chehab , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Hyun Kwon , Radhey Shyam Pandey , Michal Simek , Hans Verkuil Hi Stephen, On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote: > Hi Mauro, > > After merging the v4l-dvb tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error: > linux/amba/xilinx_dma.h: No such file or directory #include > > ^ > > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video > IP core"). > > I have reverted that commit (and the 2 following it) for today. linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by commit 937abe88aea3161cd3a563e577fc9cf4522c7aad Author: Kedareswara rao Appana Date: Mon Mar 2 23:24:24 2015 +0530 dmaengine: xilinx-dma: move header file to common location This patch moves the xilinx_dma.h header file to the include/linux/dma. Signed-off-by: Kedareswara rao Appana Signed-off-by: Vinod Koul Could you update the path instead of reverting the commits ? -- Regards, Laurent Pinchart