diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:33 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:46 +0200 |
commit | 8afe2cb4d4af5b472adeac9132200dc8c9100821 (patch) | |
tree | b6164ed60137b82e6e820a329999f4f0f515bd84 /drivers/mfd | |
parent | 12657cb99e1ca670da6a7cace3b238a42003e629 (diff) | |
parent | fff76d57d2670a8f15c875355fb840665ebf8a3e (diff) | |
download | barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.gz barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.xz |
Merge branch 'for-next-manual/oftree-linux-sync'
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/stmpe-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c index d785430d12..3a2db923fd 100644 --- a/drivers/mfd/stmpe-i2c.c +++ b/drivers/mfd/stmpe-i2c.c @@ -116,7 +116,7 @@ static struct stmpe_platform_data *stmpe_of_probe(struct device_d *dev) pdata = xzalloc(sizeof(*pdata)); - device_node_for_nach_child(dev->device_node, node) { + for_each_child_of_node(dev->device_node, node) { if (!strcmp(node->name, "stmpe_gpio")) { pdata->blocks |= STMPE_BLOCK_GPIO; } |