diff --git a/[refs] b/[refs] index 00321b38e2ef..016fc73d59e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d462fe580d6b73f0307588b898b2e6c8ad45d41 +refs/heads/master: c20ec0354f89d402c68d657d94ec3a96c82dcfb5 diff --git a/trunk/drivers/staging/media/as102/as10x_cmd.h b/trunk/drivers/staging/media/as102/as10x_cmd.h index 9af8862e4d0f..da31c6d2fe8a 100644 --- a/trunk/drivers/staging/media/as102/as10x_cmd.h +++ b/trunk/drivers/staging/media/as102/as10x_cmd.h @@ -488,10 +488,6 @@ void as10x_cmd_build(struct as10x_cmd_t *pcmd, uint16_t proc_id, uint16_t cmd_len); int as10x_rsp_parse(struct as10x_cmd_t *r, uint16_t proc_id); -#ifdef __cplusplus -extern "C" { -#endif - /* as10x cmd */ int as10x_cmd_turn_on(as10x_handle_t *phandle); int as10x_cmd_turn_off(as10x_handle_t *phandle); @@ -530,7 +526,4 @@ int as10x_cmd_get_context(as10x_handle_t *phandle, int as10x_cmd_eLNA_change_mode(as10x_handle_t *phandle, uint8_t mode); int as10x_context_rsp_parse(struct as10x_cmd_t *prsp, uint16_t proc_id); -#ifdef __cplusplus -} -#endif #endif