aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/of.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index bec215792c4f..d4c014a35ea5 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -113,14 +113,11 @@ static inline u64 of_read_number(const u32 *cell, int size)
113} 113}
114 114
115/* Like of_read_number, but we want an unsigned long result */ 115/* Like of_read_number, but we want an unsigned long result */
116#ifdef CONFIG_PPC32
117static inline unsigned long of_read_ulong(const u32 *cell, int size) 116static inline unsigned long of_read_ulong(const u32 *cell, int size)
118{ 117{
119 return cell[size-1]; 118 /* toss away upper bits if unsigned long is smaller than u64 */
119 return of_read_number(cell, size);
120} 120}
121#else
122#define of_read_ulong(cell, size) of_read_number(cell, size)
123#endif
124 121
125#include <asm/prom.h> 122#include <asm/prom.h>
126 123