diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-14 23:02:44 -0500 |
| commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
| tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /drivers/macintosh | |
| parent | 11ee7e99f35ecb15f59b21da6a82d96d2cd3fcc8 (diff) | |
| parent | f459d63e1689b16a2f5a965557e19b25bad5dbdc (diff) | |
Merge branch 'dt' into next
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/smu.c | 2 |
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) | |||
| 997 | "%02x !\n", id, hdr->id); | 997 | "%02x !\n", id, hdr->id); |
| 998 | goto failure; | 998 | goto failure; |
| 999 | } | 999 | } |
| 1000 | if (prom_add_property(smu->of_node, prop)) { | 1000 | if (of_add_property(smu->of_node, prop)) { |
| 1001 | printk(KERN_DEBUG "SMU: Failed creating sdb-partition-%02x " | 1001 | printk(KERN_DEBUG "SMU: Failed creating sdb-partition-%02x " |
| 1002 | "property !\n", id); | 1002 | "property !\n", id); |
| 1003 | goto failure; | 1003 | goto failure; |