diff options
author | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-12-11 08:41:08 +0100 |
commit | 42e64571d516ef761d9f330c80493637cbf3bdda (patch) | |
tree | 5f3df1c06c2d571efa5fd72d0c8022a80140eec2 /drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h | |
parent | serial: imx: Support common rs485 binding for RTS polarity (diff) | |
parent | Linux 4.15-rc3 (diff) | |
download | kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.gz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.tar.xz kernel-qcow2-linux-42e64571d516ef761d9f330c80493637cbf3bdda.zip |
Merge 4.15-rc3 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h index 19af4021b24c..9a167306611c 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h @@ -15,7 +15,7 @@ #ifndef __IA_CSS_PROPERTIES_H #define __IA_CSS_PROPERTIES_H -/** @file +/* @file * This file contains support for retrieving properties of some hardware the CSS system */ @@ -24,12 +24,12 @@ struct ia_css_properties { int gdc_coord_one; - bool l1_base_is_index; /**< Indicate whether the L1 page base + bool l1_base_is_index; /** Indicate whether the L1 page base is a page index or a byte address. */ enum ia_css_vamem_type vamem_type; }; -/** @brief Get hardware properties +/* @brief Get hardware properties * @param[in,out] properties The hardware properties * @return None * |