Staging driver fix for 6.2-rc5
Here is a single staging driver fix for 6.2-rc5. It resolves a build issue reported and Fixed by Arnd in the vc04_services driver. It's been in linux-next this week with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCY8wCRA8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ykjxQCfUhSZNjIy73tZg8haV7jXEVbekvAAoMz3Ploo 7TC1ZzaPkiQfIoagMcua =UzbQ -----END PGP SIGNATURE----- Merge tag 'staging-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver fix from Greg KH: "Here is a single staging driver fix for 6.2-rc5. It resolves a build issue reported and Fixed by Arnd in the vc04_services driver. It's been in linux-next this week with no reported problems" * tag 'staging-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: vchiq_arm: fix enum vchiq_status return types
This commit is contained in:
commit
bb86d65775
@ -86,7 +86,7 @@ struct vchiq_service_params_kernel {
|
||||
|
||||
struct vchiq_instance;
|
||||
|
||||
extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance);
|
||||
extern int vchiq_initialise(struct vchiq_instance **pinstance);
|
||||
extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance);
|
||||
extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance);
|
||||
extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
|
||||
|
@ -100,10 +100,10 @@ vchiq_dump_platform_use_state(struct vchiq_state *state);
|
||||
extern void
|
||||
vchiq_dump_service_use_state(struct vchiq_state *state);
|
||||
|
||||
extern enum vchiq_status
|
||||
extern int
|
||||
vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
|
||||
enum USE_TYPE_E use_type);
|
||||
extern enum vchiq_status
|
||||
extern int
|
||||
vchiq_release_internal(struct vchiq_state *state,
|
||||
struct vchiq_service *service);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user