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_morph.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_morph.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h index 969840da52b2..de409638d009 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h @@ -15,13 +15,13 @@ #ifndef __IA_CSS_MORPH_H #define __IA_CSS_MORPH_H -/** @file +/* @file * This file contains supporting for morphing table */ #include <ia_css_types.h> -/** @brief Morphing table +/* @brief Morphing table * @param[in] width Width of the morphing table. * @param[in] height Height of the morphing table. * @return Pointer to the morphing table @@ -29,7 +29,7 @@ struct ia_css_morph_table * ia_css_morph_table_allocate(unsigned int width, unsigned int height); -/** @brief Free the morph table +/* @brief Free the morph table * @param[in] me Pointer to the morph table. * @return None */ |