diff options
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: | |||
1452 | */ | 1452 | */ |
1453 | if (device_is_compatible(np, "cobalt")) | 1453 | if (device_is_compatible(np, "cobalt")) |
1454 | uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; | 1454 | uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; |
1455 | conn = of_get_property(np, "AAPL,connector", &len); | 1455 | conn = get_property(np, "AAPL,connector", &len); |
1456 | if (conn && (strcmp(conn, "infrared") == 0)) | 1456 | if (conn && (strcmp(conn, "infrared") == 0)) |
1457 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; | 1457 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; |
1458 | uap->port_type = PMAC_SCC_ASYNC; | 1458 | uap->port_type = PMAC_SCC_ASYNC; |
1459 | /* 1999 Powerbook G3 has slot-names property instead */ | 1459 | /* 1999 Powerbook G3 has slot-names property instead */ |
1460 | slots = of_get_property(np, "slot-names", &len); | 1460 | slots = get_property(np, "slot-names", &len); |
1461 | if (slots && slots->count > 0) { | 1461 | if (slots && slots->count > 0) { |
1462 | if (strcmp(slots->name, "IrDA") == 0) | 1462 | if (strcmp(slots->name, "IrDA") == 0) |
1463 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; | 1463 | uap->flags |= PMACZILOG_FLAG_IS_IRDA; |
@@ -1471,7 +1471,7 @@ no_dma: | |||
1471 | of_find_node_by_name(NULL, "i2c-modem"); | 1471 | of_find_node_by_name(NULL, "i2c-modem"); |
1472 | if (i2c_modem) { | 1472 | if (i2c_modem) { |
1473 | const char* mid = | 1473 | const char* mid = |
1474 | of_get_property(i2c_modem, "modem-id", NULL); | 1474 | get_property(i2c_modem, "modem-id", NULL); |
1475 | if (mid) switch(*mid) { | 1475 | if (mid) switch(*mid) { |
1476 | case 0x04 : | 1476 | case 0x04 : |
1477 | case 0x05 : | 1477 | case 0x05 : |