diff options
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
-rw-r--r-- | drivers/macintosh/via-pmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 1729d3fd7a11..157080b3b468 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -310,14 +310,14 @@ int __init find_via_pmu(void) | |||
310 | PMU_INT_TICK; | 310 | PMU_INT_TICK; |
311 | 311 | ||
312 | if (vias->parent->name && ((strcmp(vias->parent->name, "ohare") == 0) | 312 | if (vias->parent->name && ((strcmp(vias->parent->name, "ohare") == 0) |
313 | || device_is_compatible(vias->parent, "ohare"))) | 313 | || of_device_is_compatible(vias->parent, "ohare"))) |
314 | pmu_kind = PMU_OHARE_BASED; | 314 | pmu_kind = PMU_OHARE_BASED; |
315 | else if (device_is_compatible(vias->parent, "paddington")) | 315 | else if (of_device_is_compatible(vias->parent, "paddington")) |
316 | pmu_kind = PMU_PADDINGTON_BASED; | 316 | pmu_kind = PMU_PADDINGTON_BASED; |
317 | else if (device_is_compatible(vias->parent, "heathrow")) | 317 | else if (of_device_is_compatible(vias->parent, "heathrow")) |
318 | pmu_kind = PMU_HEATHROW_BASED; | 318 | pmu_kind = PMU_HEATHROW_BASED; |
319 | else if (device_is_compatible(vias->parent, "Keylargo") | 319 | else if (of_device_is_compatible(vias->parent, "Keylargo") |
320 | || device_is_compatible(vias->parent, "K2-Keylargo")) { | 320 | || of_device_is_compatible(vias->parent, "K2-Keylargo")) { |
321 | struct device_node *gpiop; | 321 | struct device_node *gpiop; |
322 | struct device_node *adbp; | 322 | struct device_node *adbp; |
323 | u64 gaddr = OF_BAD_ADDR; | 323 | u64 gaddr = OF_BAD_ADDR; |
@@ -2759,7 +2759,7 @@ pmu_polled_request(struct adb_request *req) | |||
2759 | 2759 | ||
2760 | #if defined(CONFIG_PM) && defined(CONFIG_PPC32) | 2760 | #if defined(CONFIG_PM) && defined(CONFIG_PPC32) |
2761 | 2761 | ||
2762 | static int pmu_sys_suspended; | 2762 | int pmu_sys_suspended; |
2763 | 2763 | ||
2764 | static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state) | 2764 | static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state) |
2765 | { | 2765 | { |