diff options
| author | Alan Cox | 2017-03-08 12:39:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-03-08 13:39:09 +0100 |
| commit | e35d4427b44217f8a1188e6301ea61bfafb37b4e (patch) | |
| tree | dcefe151feb8b657532760cb8105c3e01ee667af /drivers/staging/media/atomisp/pci/atomisp2/css2400/isp | |
| parent | atomisp: comment out some unused defines (diff) | |
| download | kernel-qcow2-linux-e35d4427b44217f8a1188e6301ea61bfafb37b4e.tar.gz kernel-qcow2-linux-e35d4427b44217f8a1188e6301ea61bfafb37b4e.tar.xz kernel-qcow2-linux-e35d4427b44217f8a1188e6301ea61bfafb37b4e.zip | |
atomisp: __SP is never defined so scrub this ifdef
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h | 5 | ||||
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h index 2f65d71c36d0..8b59a8caec52 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h @@ -146,13 +146,8 @@ more details. ISP_INPUT == IA_CSS_BINARY_INPUT_SENSOR ? 1 : \ isp_online) -#if defined(__SP) -#define ISP_DVS_ENVELOPE_WIDTH (ENABLE_DVS_ENVELOPE ? stage->dvs_envelope.width : 0) -#define ISP_DVS_ENVELOPE_HEIGHT (ENABLE_DVS_ENVELOPE ? stage->dvs_envelope.height : 0) -#else #define ISP_DVS_ENVELOPE_WIDTH 0 #define ISP_DVS_ENVELOPE_HEIGHT 0 -#endif #define _ISP_INPUT_WIDTH_VECS _ISP_VECS(ISP_INPUT_WIDTH) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h index 4fa18761f007..37a7d28f6d9f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h @@ -35,7 +35,7 @@ more details. without this extra decl. */ struct ia_css_3a_output; -#if defined(__ISP) || defined(__SP) +#if defined(__ISP) struct isp_uds_config { int hive_dx; int hive_dy; |