From 89172a69d6318c490f7f01a6b56d6e2cff1cad43 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 7 Feb 2011 11:56:14 +0100 Subject: [PATCH] --- yaml --- r: 235197 b: refs/heads/master c: 8afe3839a993beda2ebc119c0a545dcc5baecc08 h: refs/heads/master i: 235195: 326337efd96335d2a550c35f01a57f6cb82d6db5 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/include/asm/cpuinfo.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bbcf938f4ba7..763fc461f160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 419ef3406a16dfb765538f7bd67728fef9877472 +refs/heads/master: 8afe3839a993beda2ebc119c0a545dcc5baecc08 diff --git a/trunk/arch/microblaze/include/asm/cpuinfo.h b/trunk/arch/microblaze/include/asm/cpuinfo.h index cd257537ae54..d8f013347a9e 100644 --- a/trunk/arch/microblaze/include/asm/cpuinfo.h +++ b/trunk/arch/microblaze/include/asm/cpuinfo.h @@ -96,8 +96,8 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu); static inline unsigned int fcpu(struct device_node *cpu, char *n) { - int *val; - return (val = (int *) of_get_property(cpu, n, NULL)) ? + const __be32 *val; + return (val = of_get_property(cpu, n, NULL)) ? be32_to_cpup(val) : 0; }