diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hvc_iseries.c | 2 | ||||
-rw-r--r-- | drivers/char/hvc_vio.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_atmel.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index ec420fe8a908..b37f1d5a5be6 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c | |||
@@ -579,7 +579,7 @@ static int hvc_find_vtys(void) | |||
579 | if (!vtermno) | 579 | if (!vtermno) |
580 | continue; | 580 | continue; |
581 | 581 | ||
582 | if (!device_is_compatible(vty, "IBM,iSeries-vty")) | 582 | if (!of_device_is_compatible(vty, "IBM,iSeries-vty")) |
583 | continue; | 583 | continue; |
584 | 584 | ||
585 | if (num_found == 0) | 585 | if (num_found == 0) |
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c index 94a542e20efb..79711aa4b41d 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/char/hvc_vio.c | |||
@@ -157,7 +157,7 @@ static int hvc_find_vtys(void) | |||
157 | if (!vtermno) | 157 | if (!vtermno) |
158 | continue; | 158 | continue; |
159 | 159 | ||
160 | if (device_is_compatible(vty, "hvterm1")) { | 160 | if (of_device_is_compatible(vty, "hvterm1")) { |
161 | hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops); | 161 | hvc_instantiate(*vtermno, num_found, &hvc_get_put_ops); |
162 | ++num_found; | 162 | ++num_found; |
163 | } | 163 | } |
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h index 377bc6077c6f..c912d8691cbd 100644 --- a/drivers/char/tpm/tpm_atmel.h +++ b/drivers/char/tpm/tpm_atmel.h | |||
@@ -47,7 +47,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) | |||
47 | if (!dn) | 47 | if (!dn) |
48 | return NULL; | 48 | return NULL; |
49 | 49 | ||
50 | if (!device_is_compatible(dn, "AT97SC3201")) { | 50 | if (!of_device_is_compatible(dn, "AT97SC3201")) { |
51 | of_node_put(dn); | 51 | of_node_put(dn); |
52 | return NULL; | 52 | return NULL; |
53 | } | 53 | } |