diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:14:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:15:08 +0300 |
| commit | 537c2e91d3549e5d6020bb0576cf9b54a845255f (patch) | |
| tree | c09e8a1b7d733cde19b0c72678c28fb2bc97ff6b /drivers/staging/media/atomisp/i2c/gc2235.h | |
| parent | 237bb5f7f7f55ec5f773469a974c61a49c298625 (diff) | |
| parent | cba9ffdb9913dfe6be29f049ce920ce451ce7cc4 (diff) | |
| download | linux-537c2e91d3549e5d6020bb0576cf9b54a845255f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp/i2c/gc2235.h')
| -rw-r--r-- | drivers/staging/media/atomisp/i2c/gc2235.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/media/atomisp/i2c/gc2235.h b/drivers/staging/media/atomisp/i2c/gc2235.h index 55ea422291ba..ade28950db73 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.h +++ b/drivers/staging/media/atomisp/i2c/gc2235.h @@ -77,9 +77,6 @@ /* * GC2235 System control registers */ -/* - * GC2235 System control registers - */ #define GC2235_SENSOR_ID_H 0xF0 #define GC2235_SENSOR_ID_L 0xF1 #define GC2235_RESET_RELATED 0xFE @@ -167,7 +164,7 @@ enum gc2235_tok_type { GC2235_TOK_MASK = 0xfff0 }; -/** +/* * struct gc2235_reg - MI sensor register format * @type: type of the register * @reg: 8-bit offset to register |