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>
2017-03-07 13:21:24 +01:00 · 2017-03-07 13:21:24 +01:00 · 25016567be
commit 25016567be
parent 4452b090a1
39 changed files with 48 additions and 50 deletions
--- 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/
--- 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>
--- 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>
--- 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"

--- 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"

--- 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>

--- 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"

--- 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>

--- 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>

--- 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>


--- 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)
--- 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)
--- 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>
--- 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>
--- 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)
 {
--- 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>

--- 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 */

--- 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"
--- 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

--- 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"

--- 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"
--- 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>

--- 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"

--- 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"
--- 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"

--- 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
--- 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
--- 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
--- 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);
--- 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>

--- 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"
--- 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>

--- 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>

--- 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 \
--- 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>
--- 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 */
--- 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.
--- 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

--- 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);