Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25016567 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarkbuild test robot <fengguang.wu@intel.com>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4452b090

drivers/staging/media/atomisp/Makefile

+0 −2
Original line number Diff line number Diff line 
#

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

drivers/staging/media/atomisp/i2c/ap1302.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/media/atomisp/i2c/ap1302.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/media/atomisp/i2c/gc0310.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/staging/media/atomisp/i2c/gc0310.h

+1 −1
Original line number Diff line number Diff line
@@ -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"