diff options
| author | Greg Kroah-Hartman | 2017-03-07 13:21:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-03-07 13:21:24 +0100 |
| commit | 25016567be26887232aa3f6fd0d0116356691cc3 (patch) | |
| tree | be0475a2ecd4976885785590741f67faef00a883 /drivers/staging/media/atomisp/pci/atomisp2 | |
| parent | staging: greybus: Replace "is is" with "is" (diff) | |
| download | kernel-qcow2-linux-25016567be26887232aa3f6fd0d0116356691cc3.tar.gz kernel-qcow2-linux-25016567be26887232aa3f6fd0d0116356691cc3.tar.xz kernel-qcow2-linux-25016567be26887232aa3f6fd0d0116356691cc3.zip | |
staging: atomisp: fix include Makefile mess
Using LINUXINCLUDE is a very old hack, and doesn't play well with
building objects in a different directory than the kernel source is in.
So fix up the include file references to be relative to make it obvious
we are pulling in local include files, which need to get fixed up.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2')
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h index 6a2d1f99cab4..5b58e7d9ca5b 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h @@ -22,7 +22,7 @@ #ifndef __ATOMISP_ACC_H__ #define __ATOMISP_ACC_H__ -#include <linux/atomisp.h> +#include "../../include/linux/atomisp.h" #include "atomisp_internal.h" #include "ia_css_types.h" diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h index abca5cc58dac..8e6d9df7ad1a 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h @@ -24,7 +24,7 @@ #ifndef __ATOMISP_CMD_H__ #define __ATOMISP_CMD_H__ -#include <linux/atomisp.h> +#include "../../include/linux/atomisp.h" #include <linux/interrupt.h> #include <linux/videodev2.h> diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h index 3044e0ef6587..69d1526da362 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h @@ -24,7 +24,7 @@ #ifndef __ATOMISP_COMMON_H__ #define __ATOMISP_COMMON_H__ -#include <linux/atomisp.h> +#include "../../include/linux/atomisp.h" #include <linux/v4l2-mediabus.h> diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h index 5a404e4bee43..e6b0ccea8d12 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h @@ -24,7 +24,7 @@ #include "atomisp_compat_css20.h" -#include <linux/atomisp.h> +#include "../../include/linux/atomisp.h" #include <media/videobuf-vmalloc.h> #define CSS_RX_IRQ_INFO_BUFFER_OVERRUN \ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h index a21f79386026..d3667132851b 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h @@ -23,14 +23,14 @@ #ifndef __ATOMISP_INTERNAL_H__ #define __ATOMISP_INTERNAL_H__ -#include <linux/atomisp_platform.h> +#include "../../include/linux/atomisp_platform.h" #include <linux/firmware.h> #include <linux/kernel.h> #include <linux/pm_qos.h> #include <linux/idr.h> #include <asm/intel-mid.h> -#include <asm/intel_mid_pcihelpers.h> +#include "../../include/asm/intel_mid_pcihelpers.h" #include <media/media-device.h> #include <media/v4l2-subdev.h> diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c index 800562dc604a..46cdb0f3f993 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c @@ -27,9 +27,9 @@ #include <linux/timer.h> #include <linux/delay.h> #include <linux/interrupt.h> -#include <linux/intel_mid_pm.h> +#include "../../include/linux/intel_mid_pm.h" -#include <linux/atomisp_gmin_platform.h> +#include "../../include/linux/atomisp_gmin_platform.h" #include "atomisp_cmd.h" #include "atomisp_common.h" @@ -47,7 +47,7 @@ #include "hrt/hive_isp_css_mm_hrt.h" #include "device_access.h" -#include <linux/intel_mid_pm.h> +#include "../../include/linux/intel_mid_pm.h" #include <asm/intel-mid.h> /* G-Min addition: pull this in from intel_mid_pm.h */ |