Skip to content

GitLab

Unverified Commit 08c03523 authored by Simon Duquennoy's avatar Simon Duquennoy Committed by GitHub
Browse files

Merge branch 'develop' into contrib/routing-api

parents 8aec2ac0 9777ac43
Hide whitespace changes
Inline Side-by-side
arch/cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c
View file @ 08c03523
......@@ -122,5 +122,5 @@ const struct configuration_st {
};
const struct usb_st_configuration_descriptor const *configuration_head =
(struct usb_st_configuration_descriptor const*)&configuration_block;
const struct usb_st_configuration_descriptor* const configuration_head =
(const struct usb_st_configuration_descriptor*)&configuration_block;
arch/cpu/arm/common/usb/descriptors.h
View file @ 08c03523
......@@ -6,5 +6,5 @@
#endif
extern const struct usb_st_device_descriptor device_descriptor;
extern const struct usb_st_configuration_descriptor const *configuration_head;
extern const struct usb_st_configuration_descriptor* const configuration_head;
#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */
arch/cpu/cc2538/usb/cdc-acm-descriptors.c
View file @ 08c03523
......@@ -161,7 +161,7 @@ const struct configuration_st {
};
const struct usb_st_configuration_descriptor const *configuration_head =
(struct usb_st_configuration_descriptor const *)&configuration_block;
const struct usb_st_configuration_descriptor* const configuration_head =
(const struct usb_st_configuration_descriptor*)&configuration_block;
/** @} */
arch/cpu/cc2538/usb/common/descriptors.h
View file @ 08c03523
......@@ -6,5 +6,5 @@
#endif
extern const struct usb_st_device_descriptor device_descriptor;
extern const struct usb_st_configuration_descriptor const *configuration_head;
extern const struct usb_st_configuration_descriptor* const configuration_head;
#endif /* DESCRIPTORS_H_RPFUB8O7OV__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment