Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for...

[~andy/linux] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index aa805250de765e5e1c9531e0b9cbfbb6143683f2..710b53bfac6d9478b86aed67e537bc06ee1cbc6d 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -33,7 +33,7 @@ DEFINE_RWLOCK(devtree_lock);
 
 int of_n_addr_cells(struct device_node *np)
 {
-       const int *ip;
+       const __be32 *ip;
 
        do {
                if (np->parent)
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(of_n_addr_cells);
 
 int of_n_size_cells(struct device_node *np)
 {
-       const int *ip;
+       const __be32 *ip;
 
        do {
                if (np->parent)