diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
| commit | e05529dd8b582c4421938066a5ff5006452ced78 (patch) | |
| tree | b4e925b08f2f672c6331db06c4b1986e58f89a75 /include | |
| parent | 0c3f4d1da2277ac0cb88dc32ac0de48bc241e01f (diff) | |
| parent | 9563a024d28c0f35db8fc459931f4909bbffe5eb (diff) | |
| download | barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.gz barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/menu.h | 2 | ||||
| -rw-r--r-- | include/regmap.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/menu.h b/include/menu.h index 3e704a8907..2fef064499 100644 --- a/include/menu.h +++ b/include/menu.h @@ -91,7 +91,7 @@ int menu_set_selected_entry(struct menu *m, struct menu_entry* me); int menu_set_selected(struct menu *m, int num); int menu_set_auto_select(struct menu *m, int delay); struct menu* menu_get_menus(void); -void menu_add_title(struct menu *m, char *display); +void menu_add_title(struct menu *m, const char *display); /* * menu entry functions diff --git a/include/regmap.h b/include/regmap.h index bcbe6c1554..9675a17b96 100644 --- a/include/regmap.h +++ b/include/regmap.h @@ -60,4 +60,8 @@ int regmap_get_val_bytes(struct regmap *map); int regmap_get_max_register(struct regmap *map); int regmap_get_reg_stride(struct regmap *map); -#endif /* __REGMAP_H */
\ No newline at end of file +int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val); + + +#endif /* __REGMAP_H */ |