diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/mips/ralink/of.c | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/mips/ralink/of.c')
| -rw-r--r-- | arch/mips/ralink/of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c index 6b5f3406f414..f25ea5b45051 100644 --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c | |||
| @@ -104,7 +104,7 @@ static int __init plat_of_setup(void) | |||
| 104 | if (!of_have_populated_dt()) | 104 | if (!of_have_populated_dt()) |
| 105 | panic("device tree not present"); | 105 | panic("device tree not present"); |
| 106 | 106 | ||
| 107 | strncpy(of_ids[0].compatible, soc_info.compatible, len); | 107 | strlcpy(of_ids[0].compatible, soc_info.compatible, len); |
| 108 | strncpy(of_ids[1].compatible, "palmbus", len); | 108 | strncpy(of_ids[1].compatible, "palmbus", len); |
| 109 | 109 | ||
| 110 | if (of_platform_populate(NULL, of_ids, NULL, NULL)) | 110 | if (of_platform_populate(NULL, of_ids, NULL, NULL)) |