diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:26:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:26:35 +0100 |
| commit | cf1b29a8504c83bb1922e249c2293a3ecd2920da (patch) | |
| tree | 985fb808f28f7c4bff9461d0b5edde5b2b38841b /include | |
| parent | e0f22f8d43ea9aa1094b10ad217fbb8d538a3554 (diff) | |
| parent | 6dac289d0c631182a8e60a91d0ad8b0bfc6e451d (diff) | |
| download | barebox-cf1b29a8504c83bb1922e249c2293a3ecd2920da.tar.gz barebox-cf1b29a8504c83bb1922e249c2293a3ecd2920da.tar.xz | |
Merge branch 'for-next/ubi'
Conflicts:
drivers/mtd/ubi/cdev.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/param.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/param.h b/include/param.h index 7830f6f159..e8458b5b2d 100644 --- a/include/param.h +++ b/include/param.h @@ -54,7 +54,7 @@ struct param_d *dev_add_param_ip(struct device_d *dev, const char *name, int (*get)(struct param_d *p, void *priv), IPaddr_t *ip, void *priv); -int dev_add_param_fixed(struct device_d *dev, char *name, char *value); +int dev_add_param_fixed(struct device_d *dev, char *name, const char *value); void dev_remove_param(struct param_d *p); |