diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 05:02:44 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-15 05:02:44 +0100 |
| commit | de1bb03af7f4dde8e0e823629909d179fed4beff (patch) | |
| tree | 4ea86f8e160b8ea5c9689883c7f7da1536f5294b /drivers/macintosh | |
| parent | powerpc: Fix CONFIG_RELOCATABLE=y CONFIG_CRASH_DUMP=n build (diff) | |
| parent | powerpc+of: Remove the pSeries_reconfig.h file (diff) | |
| download | linux-de1bb03af7f4dde8e0e823629909d179fed4beff.tar.xz linux-de1bb03af7f4dde8e0e823629909d179fed4beff.zip | |
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) "%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; |