summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-11-15 15:02:44 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-11-15 15:02:44 +1100
commitde1bb03af7f4dde8e0e823629909d179fed4beff (patch)
tree4ea86f8e160b8ea5c9689883c7f7da1536f5294b /drivers/macintosh
parent11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (diff)
parentf459d63e1689b16a2f5a965557e19b25bad5dbdc (diff)
downloadblackbird-obmc-linux-de1bb03af7f4dde8e0e823629909d179fed4beff.tar.gz
blackbird-obmc-linux-de1bb03af7f4dde8e0e823629909d179fed4beff.zip
Merge branch 'dt' into next
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/smu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 7d5a6b40b31c..5b939509db3b 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -997,7 +997,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id)
"%02x !\n", id, hdr->id);
goto failure;
}
- if (prom_add_property(smu->of_node, prop)) {
+ if (of_add_property(smu->of_node, prop)) {
printk(KERN_DEBUG "SMU: Failed creating sdb-partition-%02x "
"property !\n", id);
goto failure;
OpenPOWER on IntegriCloud