diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-26 14:24:31 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 14:24:31 +0200 |
| commit | a48141db68e4b9143759435badcc1a49d9022db4 (patch) | |
| tree | a7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/serial/pmac_zilog.c | |
| parent | Revert "[POWERPC] DMA 4GB boundary protection" (diff) | |
| download | linux-a48141db68e4b9143759435badcc1a49d9022db4.tar.xz linux-a48141db68e4b9143759435badcc1a49d9022db4.zip | |
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3,
which included changes which should go via other subsystem
maintainers.
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index cd92a3966b0c..be8d75721a85 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -1452,12 +1452,12 @@ no_dma: */ if (device_is_compatible(np, "cobalt")) uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; - conn = of_get_property(np, "AAPL,connector", &len); + conn = get_property(np, "AAPL,connector", &len); if (conn && (strcmp(conn, "infrared") == 0)) uap->flags |= PMACZILOG_FLAG_IS_IRDA; uap->port_type = PMAC_SCC_ASYNC; /* 1999 Powerbook G3 has slot-names property instead */ - slots = of_get_property(np, "slot-names", &len); + slots = get_property(np, "slot-names", &len); if (slots && slots->count > 0) { if (strcmp(slots->name, "IrDA") == 0) uap->flags |= PMACZILOG_FLAG_IS_IRDA; @@ -1471,7 +1471,7 @@ no_dma: of_find_node_by_name(NULL, "i2c-modem"); if (i2c_modem) { const char* mid = - of_get_property(i2c_modem, "modem-id", NULL); + get_property(i2c_modem, "modem-id", NULL); if (mid) switch(*mid) { case 0x04 : case 0x05 : |