summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2017-03-08 11:39:08 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-08 13:39:55 +0100
commit2267a75047de86993b1280f59ba59bc8e3c0b599 (patch)
treeb511e285e3c8966a81fc17d557225bfad709b714
parent5cacee52f93d54df66bdc09b1ecaf2852b399e48 (diff)
atomisp: HRT_KERNEL is always defined so clean up the ifdef use
Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/Makefile2
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h4
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/drivers/staging/media/atomisp/pci/atomisp2/Makefile
index 5e4a3c6b50a0..2e00837dbd66 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/Makefile
+++ b/drivers/staging/media/atomisp/pci/atomisp2/Makefile
@@ -365,7 +365,7 @@ ifeq ($(CONFIG_ION),y)
INCLUDES += -I$(srctree)/drivers/staging/android/ion
endif
-DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -DHRT_KERNEL -D__HOST__
+DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__
#DEFINES += -DUSE_DYNAMIC_BIN
#DEFINES += -DISP_POWER_GATING
#DEFINES += -DUSE_INTERRUPTS
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
index 5363c5a9b131..41c6d14ca611 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
@@ -24,10 +24,6 @@
#ifndef _hive_isp_css_mm_hrt_h_
#define _hive_isp_css_mm_hrt_h_
-#ifndef HRT_KERNEL
-/* size_t is defined already in kernel mode */
-#include <stdlib.h>
-#endif
#include <hmm/hmm.h>
#include <hrt/hive_isp_css_custom_host_hrt.h>