Merge commit 'v2.6.34-rc1' into for-linus

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

diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index fa65a2b2ae2e44737edb5d4e19daf767e331bd9c..a3a708e590d00eabbd2ce62105d2bd4c06bbd922 100644 (file)
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -25,7 +25,7 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
        for_each_child_of_node(adap_node, node) {
                struct i2c_board_info info = {};
                struct dev_archdata dev_ad = {};
-               const u32 *addr;
+               const __be32 *addr;
                int len;
 
                if (of_modalias_node(node, info.type, sizeof(info.type)) < 0)
@@ -40,7 +40,7 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
 
                info.irq = irq_of_parse_and_map(node, 0);
 
-               info.addr = *addr;
+               info.addr = be32_to_cpup(addr);
 
                dev_archdata_set_node(&dev_ad, node);
                info.archdata = &dev_ad;