diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-29 23:26:40 +0300 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-01-30 19:30:00 +0300 |
commit | e7996a9a77fc669387da43ff4823b91cc4872bd0 (patch) | |
tree | 617f0a128e222539d67e8cccc359f1bc4b984900 /drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h | |
parent | b5fa635aab8f0d39a824c01991266a6d06f007fb (diff) | |
parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff (diff) | |
download | linux-e7996a9a77fc669387da43ff4823b91cc4872bd0.tar.xz |
Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
To resolve conflicts in:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h index a25581c6f3ac..2c9e5a8ceb98 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h @@ -15,17 +15,17 @@ #ifndef __IA_CSS_MACC_TYPES_H #define __IA_CSS_MACC_TYPES_H -/** @file +/* @file * CSS-API header file for Multi-Axis Color Correction (MACC) parameters. */ -/** Number of axes in the MACC table. */ +/* Number of axes in the MACC table. */ #define IA_CSS_MACC_NUM_AXES 16 -/** Number of coefficients per MACC axes. */ +/* Number of coefficients per MACC axes. */ #define IA_CSS_MACC_NUM_COEFS 4 -/** The number of planes in the morphing table. */ +/* The number of planes in the morphing table. */ -/** Multi-Axis Color Correction (MACC) table. +/* Multi-Axis Color Correction (MACC) table. * * ISP block: MACC1 (MACC by only matrix) * MACC2 (MACC by matrix and exponent(ia_css_macc_config)) @@ -51,7 +51,7 @@ struct ia_css_macc_table { int16_t data[IA_CSS_MACC_NUM_COEFS * IA_CSS_MACC_NUM_AXES]; - /**< 16 of 2x2 matix + /** 16 of 2x2 matix MACC1: s2.13, [-65536,65535] default/ineffective: 16 of "identity 2x2 matix" {8192,0,0,8192} |