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>

39 files changed, 48 insertions, 50 deletions

diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile
index e16752e6af79..403fe5edff6d 100644
--- a/drivers/staging/media/atomisp/Makefile
+++ b/drivers/staging/media/atomisp/Makefile
@@ -1,8 +1,6 @@
 #
 # Makefile for camera drivers.
 #
-
 obj-$(CONFIG_INTEL_ATOMISP) += pci/
 obj-$(CONFIG_INTEL_ATOMISP) += i2c/
 obj-$(CONFIG_INTEL_ATOMISP) += platform/
-LINUXINCLUDE        += -I drivers/staging/media/atomisp/include/
diff --git a/drivers/staging/media/atomisp/i2c/ap1302.c b/drivers/staging/media/atomisp/i2c/ap1302.c
index 36d218da4971..31eae819fcd1 100644
--- a/drivers/staging/media/atomisp/i2c/ap1302.c
+++ b/drivers/staging/media/atomisp/i2c/ap1302.c
@@ -18,7 +18,7 @@
  *
  */
 
-#include <linux/atomisp.h>
+#include "../include/linux/atomisp.h"
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
diff --git a/drivers/staging/media/atomisp/i2c/ap1302.h b/drivers/staging/media/atomisp/i2c/ap1302.h
index 3ccad298c5e3..9341232c580d 100644
--- a/drivers/staging/media/atomisp/i2c/ap1302.h
+++ b/drivers/staging/media/atomisp/i2c/ap1302.h
@@ -21,7 +21,7 @@
 #ifndef __AP1302_H__
 #define __AP1302_H__
 
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 #include <linux/regmap.h>
 #include <linux/types.h>
 #include <media/v4l2-ctrls.h>
diff --git a/drivers/staging/media/atomisp/i2c/gc0310.c b/drivers/staging/media/atomisp/i2c/gc0310.c
index bf8b2455a009..add8b9091924 100644
--- a/drivers/staging/media/atomisp/i2c/gc0310.c
+++ b/drivers/staging/media/atomisp/i2c/gc0310.c
@@ -30,7 +30,7 @@
 #include <linux/moduleparam.h>
 #include <media/v4l2-device.h>
 #include <linux/io.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 
 #include "gc0310.h"
 
diff --git a/drivers/staging/media/atomisp/i2c/gc0310.h b/drivers/staging/media/atomisp/i2c/gc0310.h
index efc930abac21..f31eb277f542 100644
--- a/drivers/staging/media/atomisp/i2c/gc0310.h
+++ b/drivers/staging/media/atomisp/i2c/gc0310.h
@@ -34,7 +34,7 @@
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
 
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 
 #define GC0310_NAME		"gc0310"
 
diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c
index aa7fc0e6e0be..37a83c759874 100644
--- a/drivers/staging/media/atomisp/i2c/gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/gc2235.c
@@ -29,7 +29,7 @@
 #include <linux/gpio.h>
 #include <linux/moduleparam.h>
 #include <media/v4l2-device.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 #include <linux/acpi.h>
 #include <linux/io.h>
 
diff --git a/drivers/staging/media/atomisp/i2c/gc2235.h b/drivers/staging/media/atomisp/i2c/gc2235.h
index a67f3f13efe7..ccbc757045a5 100644
--- a/drivers/staging/media/atomisp/i2c/gc2235.h
+++ b/drivers/staging/media/atomisp/i2c/gc2235.h
@@ -31,7 +31,7 @@
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
 
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 
 #define GC2235_NAME		"gc2235"
 
diff --git a/drivers/staging/media/atomisp/i2c/imx/ad5816g.h b/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
index 7410628c28c3..f995c2eeada4 100644
--- a/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
+++ b/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
@@ -1,7 +1,7 @@
 #ifndef __AD5816G_H__
 #define __AD5816G_H__
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/types.h>
 #include <linux/time.h>
 
diff --git a/drivers/staging/media/atomisp/i2c/imx/drv201.h b/drivers/staging/media/atomisp/i2c/imx/drv201.h
index f5f5eecc63a9..8fc0ad116630 100644
--- a/drivers/staging/media/atomisp/i2c/imx/drv201.h
+++ b/drivers/staging/media/atomisp/i2c/imx/drv201.h
@@ -1,7 +1,7 @@
 #ifndef __DRV201_H__
 #define __DRV201_H__
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/types.h>
 #include <linux/time.h>
 
diff --git a/drivers/staging/media/atomisp/i2c/imx/dw9714.h b/drivers/staging/media/atomisp/i2c/imx/dw9714.h
index 50f988c1562f..5a98a9c97182 100644
--- a/drivers/staging/media/atomisp/i2c/imx/dw9714.h
+++ b/drivers/staging/media/atomisp/i2c/imx/dw9714.h
@@ -1,7 +1,7 @@
 #ifndef __DW9714_H__
 #define __DW9714_H__
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/types.h>
 
 
diff --git a/drivers/staging/media/atomisp/i2c/imx/dw9718.h b/drivers/staging/media/atomisp/i2c/imx/dw9718.h
index fe1fb8a0954c..4a1040c3149f 100644
--- a/drivers/staging/media/atomisp/i2c/imx/dw9718.h
+++ b/drivers/staging/media/atomisp/i2c/imx/dw9718.h
@@ -22,7 +22,7 @@
 #ifndef __DW9718_H__
 #define __DW9718_H__
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/types.h>
 
 #define DW9718_VCM_ADDR	 (0x18 >> 1)
diff --git a/drivers/staging/media/atomisp/i2c/imx/dw9719.h b/drivers/staging/media/atomisp/i2c/imx/dw9719.h
index cde62752e915..711f412aef2a 100644
--- a/drivers/staging/media/atomisp/i2c/imx/dw9719.h
+++ b/drivers/staging/media/atomisp/i2c/imx/dw9719.h
@@ -22,7 +22,7 @@
 #ifndef __DW9719_H__
 #define __DW9719_H__
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/types.h>
 
 #define DW9719_VCM_ADDR	 (0x18 >> 1)
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx.c b/drivers/staging/media/atomisp/i2c/imx/imx.c
index f6e12c688aba..a73f90282c89 100644
--- a/drivers/staging/media/atomisp/i2c/imx/imx.c
+++ b/drivers/staging/media/atomisp/i2c/imx/imx.c
@@ -19,7 +19,7 @@
  *
  */
 #include <asm/intel-mid.h>
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/delay.h>
@@ -30,7 +30,7 @@
 #include <linux/i2c.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/libmsrlisthelper.h>
+#include "../../include/linux/libmsrlisthelper.h"
 #include <linux/mm.h>
 #include <linux/kmod.h>
 #include <linux/module.h>
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx.h b/drivers/staging/media/atomisp/i2c/imx/imx.h
index 3b91887867d8..36b3f3a5a41f 100644
--- a/drivers/staging/media/atomisp/i2c/imx/imx.h
+++ b/drivers/staging/media/atomisp/i2c/imx/imx.h
@@ -21,8 +21,8 @@
 
 #ifndef __IMX_H__
 #define __IMX_H__
-#include <linux/atomisp_platform.h>
-#include <linux/atomisp.h>
+#include "../../include/linux/atomisp_platform.h"
+#include "../../include/linux/atomisp.h"
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
diff --git a/drivers/staging/media/atomisp/i2c/imx/vcm.c b/drivers/staging/media/atomisp/i2c/imx/vcm.c
index 983651352e88..2d2df04c800a 100644
--- a/drivers/staging/media/atomisp/i2c/imx/vcm.c
+++ b/drivers/staging/media/atomisp/i2c/imx/vcm.c
@@ -20,7 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <media/v4l2-device.h>
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 
 int vcm_power_up(struct v4l2_subdev *sd)
 {
diff --git a/drivers/staging/media/atomisp/i2c/libmsrlisthelper.c b/drivers/staging/media/atomisp/i2c/libmsrlisthelper.c
index e04cefd702f8..decb65cfd7c9 100644
--- a/drivers/staging/media/atomisp/i2c/libmsrlisthelper.c
+++ b/drivers/staging/media/atomisp/i2c/libmsrlisthelper.c
@@ -20,7 +20,7 @@
 #include <linux/firmware.h>
 #include <linux/device.h>
 #include <linux/export.h>
-#include <linux/libmsrlisthelper.h>
+#include "../include/linux/libmsrlisthelper.h"
 #include <linux/module.h>
 #include <linux/slab.h>
 
diff --git a/drivers/staging/media/atomisp/i2c/lm3554.c b/drivers/staging/media/atomisp/i2c/lm3554.c
index 56cb5bc1e562..dd9c9c3ffff7 100644
--- a/drivers/staging/media/atomisp/i2c/lm3554.c
+++ b/drivers/staging/media/atomisp/i2c/lm3554.c
@@ -25,13 +25,13 @@
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
-#include <media/lm3554.h>
+#include "../include/media/lm3554.h"
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <linux/acpi.h>
 #include <linux/gpio/consumer.h>
-#include <linux/atomisp_gmin_platform.h>
-#include <linux/atomisp.h>
+#include "../include/linux/atomisp_gmin_platform.h"
+#include "../include/linux/atomisp.h"
 
 /* Registers */
 
diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c
index 669b123d621e..876212455962 100644
--- a/drivers/staging/media/atomisp/i2c/mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.c
@@ -35,7 +35,7 @@
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/acpi.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 #include <media/v4l2-device.h>
 
 #include "mt9m114.h"
diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.h b/drivers/staging/media/atomisp/i2c/mt9m114.h
index 3f51fb1a7ac7..a66cbfd66e86 100644
--- a/drivers/staging/media/atomisp/i2c/mt9m114.h
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.h
@@ -33,8 +33,8 @@
 #include <media/v4l2-ctrls.h>
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
-#include <linux/atomisp_platform.h>
-#include <linux/atomisp.h>
+#include "../include/linux/atomisp_platform.h"
+#include "../include/linux/atomisp.h"
 
 #define V4L2_IDENT_MT9M114 8245
 
diff --git a/drivers/staging/media/atomisp/i2c/ov2680.c b/drivers/staging/media/atomisp/i2c/ov2680.c
index 99ae74679978..58d2a075d436 100644
--- a/drivers/staging/media/atomisp/i2c/ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/ov2680.c
@@ -31,7 +31,7 @@
 #include <media/v4l2-device.h>
 #include <linux/io.h>
 #include <linux/acpi.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 
 #include "ov2680.h"
 
diff --git a/drivers/staging/media/atomisp/i2c/ov2680.h b/drivers/staging/media/atomisp/i2c/ov2680.h
index 5ee2cfcc1684..944fe8e3bcbf 100644
--- a/drivers/staging/media/atomisp/i2c/ov2680.h
+++ b/drivers/staging/media/atomisp/i2c/ov2680.h
@@ -33,7 +33,7 @@
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
 
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 
 #define OV2680_NAME		"ov2680"
 #define OV2680B_NAME	"ov2680b"
diff --git a/drivers/staging/media/atomisp/i2c/ov2722.c b/drivers/staging/media/atomisp/i2c/ov2722.c
index f81751271209..43e872a96930 100644
--- a/drivers/staging/media/atomisp/i2c/ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/ov2722.c
@@ -29,7 +29,7 @@
 #include <linux/gpio.h>
 #include <linux/moduleparam.h>
 #include <media/v4l2-device.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 #include <linux/acpi.h>
 #include <linux/io.h>
 
diff --git a/drivers/staging/media/atomisp/i2c/ov2722.h b/drivers/staging/media/atomisp/i2c/ov2722.h
index e8f17f270806..b0d40965d89e 100644
--- a/drivers/staging/media/atomisp/i2c/ov2722.h
+++ b/drivers/staging/media/atomisp/i2c/ov2722.h
@@ -33,7 +33,7 @@
 #include <media/media-entity.h>
 #include <media/v4l2-ctrls.h>
 
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 
 #define OV2722_NAME		"ov2722"
 
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
index 51605ac40272..e3d4d0e0ed9c 100644
--- a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
@@ -36,7 +36,7 @@
 #include <media/v4l2-device.h>
 #include <linux/io.h>
 #include <linux/acpi.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../../include/linux/atomisp_gmin_platform.h"
 
 #include "ov5693.h"
 #include "ad5823.h"
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
index 14ed4d1a1f4e..d88ac1777d86 100644
--- a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
+++ b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.h
@@ -33,7 +33,7 @@
 #include <linux/v4l2-mediabus.h>
 #include <media/media-entity.h>
 
-#include <linux/atomisp_platform.h>
+#include "../../include/linux/atomisp_platform.h"
 
 #define OV5693_NAME		"ov5693"
 
diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c
index f2184946f892..cc7da2a4a84e 100644
--- a/drivers/staging/media/atomisp/i2c/ov8858.c
+++ b/drivers/staging/media/atomisp/i2c/ov8858.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <media/v4l2-device.h>
 #include <linux/acpi.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../include/linux/atomisp_gmin_platform.h"
 #ifdef CONFIG_PLATFORM_BTNS
 #include "ov8858_btns.h"
 #else
diff --git a/drivers/staging/media/atomisp/i2c/ov8858.h b/drivers/staging/media/atomisp/i2c/ov8858.h
index 13c8fb12d9f6..9be6a0e63861 100644
--- a/drivers/staging/media/atomisp/i2c/ov8858.h
+++ b/drivers/staging/media/atomisp/i2c/ov8858.h
@@ -21,7 +21,7 @@
 
 #ifndef __OV8858_H__
 #define __OV8858_H__
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 #include <media/v4l2-ctrls.h>
 
 #define I2C_MSG_LENGTH		0x2
diff --git a/drivers/staging/media/atomisp/i2c/ov8858_btns.h b/drivers/staging/media/atomisp/i2c/ov8858_btns.h
index c0cd47698fe4..09e3cdc1a394 100644
--- a/drivers/staging/media/atomisp/i2c/ov8858_btns.h
+++ b/drivers/staging/media/atomisp/i2c/ov8858_btns.h
@@ -21,7 +21,7 @@
 
 #ifndef __OV8858_H__
 #define __OV8858_H__
-#include <linux/atomisp_platform.h>
+#include "../include/linux/atomisp_platform.h"
 #include <media/v4l2-ctrls.h>
 
 #define I2C_MSG_LENGTH		0x2
diff --git a/drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h b/drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h
index 623e7e2b2cd6..5390b97ac6e7 100644
--- a/drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h
@@ -15,7 +15,7 @@
 #ifndef ATOMISP_GMIN_PLATFORM_H_
 #define ATOMISP_GMIN_PLATFORM_H_
 
-#include <linux/atomisp_platform.h>
+#include "atomisp_platform.h"
 
 const struct atomisp_camera_caps *atomisp_get_default_camera_caps(void);
 const struct atomisp_platform_data *atomisp_get_platform_data(void);
diff --git a/drivers/staging/media/atomisp/include/linux/intel_mid_pm.h b/drivers/staging/media/atomisp/include/linux/intel_mid_pm.h
index b084d716a218..82f8b57b309f 100644
--- a/drivers/staging/media/atomisp/include/linux/intel_mid_pm.h
+++ b/drivers/staging/media/atomisp/include/linux/intel_mid_pm.h
@@ -17,7 +17,7 @@
 #ifndef INTEL_MID_PM_H
 #define INTEL_MID_PM_H
 
-#include <asm/intel-mid.h>
+#include "../asm/intel-mid.h"
 #include <linux/init.h>
 #include <linux/pci.h>
 
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 */
diff --git a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
index e50a2009df64..a8ca93dbfbb5 100644
--- a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
+++ b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c
@@ -22,7 +22,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/vlv2_plat_clock.h>
+#include "../../include/linux/vlv2_plat_clock.h"
 
 /* NOTE: Most of below constants could come from platform data.
  * To be fixed when appropriate ACPI support comes.
diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
index 39765bd081e2..65513cae93ce 100644
--- a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
@@ -7,13 +7,13 @@
 #include <linux/delay.h>
 #include <media/v4l2-subdev.h>
 #include <linux/mfd/intel_soc_pmic.h>
-#include <linux/vlv2_plat_clock.h>
+#include "../../include/linux/vlv2_plat_clock.h"
 #include <linux/regulator/consumer.h>
 #include <linux/gpio/consumer.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
-#include <linux/atomisp_platform.h>
-#include <linux/atomisp_gmin_platform.h>
+#include "../../include/linux/atomisp_platform.h"
+#include "../../include/linux/atomisp_gmin_platform.h"
 
 #define MAX_SUBDEVS 8
 
diff --git a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
index 1f97dff1c9b0..a6c0f5f8c3f8 100644
--- a/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+++ b/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
@@ -25,7 +25,7 @@ static inline int platform_is(u8 model)
         return (boot_cpu_data.x86_model == model);
 }
 
-#include <asm/intel_mid_pcihelpers.h>
+#include "../../include/asm/intel_mid_pcihelpers.h"
 
 /* Unified message bus read/write operation */
 static DEFINE_SPINLOCK(msgbus_lock);