diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-12-20 22:56:45 +0100 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-12-27 17:57:13 +0100 |
commit | 7b482c8360d368fd495685a2c69ca4f1e7b29764 (patch) | |
tree | 3cd4fc6d7785d3fd0dd21c7d34cdc1731f2ff6c7 /drivers/of/fdt.c | |
parent | of/base: Take NULL string into account for property with multiple strings (diff) | |
download | linux-7b482c8360d368fd495685a2c69ca4f1e7b29764.tar.xz linux-7b482c8360d368fd495685a2c69ca4f1e7b29764.zip |
ARM/of: allow *machine_desc.dt_compat to be const
This allows dt_compat to point to a constant list of compatible strings.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/of/fdt.c')
-rw-r--r-- | drivers/of/fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index fd85fa298e0f..7dc8e6da858d 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -107,7 +107,7 @@ int of_fdt_is_compatible(struct boot_param_header *blob, * of_fdt_match - Return true if node matches a list of compatible values */ int of_fdt_match(struct boot_param_header *blob, unsigned long node, - const char **compat) + const char *const *compat) { unsigned int tmp, score = 0; @@ -541,7 +541,7 @@ int __init of_flat_dt_is_compatible(unsigned long node, const char *compat) /** * of_flat_dt_match - Return true if node matches a list of compatible values */ -int __init of_flat_dt_match(unsigned long node, const char **compat) +int __init of_flat_dt_match(unsigned long node, const char *const *compat) { return of_fdt_match(initial_boot_params, node, compat); } |