diff options
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index be8d75721a8..0fa9f676176 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c @@ -1450,14 +1450,14 @@ no_dma:  	/*  	 * Detect port type  	 */ -	if (device_is_compatible(np, "cobalt")) +	if (of_device_is_compatible(np, "cobalt"))  		uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; -	conn = get_property(np, "AAPL,connector", &len); +	conn = of_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 = get_property(np, "slot-names", &len); +	slots = of_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 = -				get_property(i2c_modem, "modem-id", NULL); +				of_get_property(i2c_modem, "modem-id", NULL);  			if (mid) switch(*mid) {  			case 0x04 :  			case 0x05 :  | 
