diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-01 21:34:14 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-09 08:33:00 -0700 |
| commit | 71a157e8edca55198e808f8561dd49017a54ee34 (patch) | |
| tree | a78185ea8204f1e375d88545235ba3d4937ebfaf /drivers/macintosh/via-pmu.c | |
| parent | 89751a7cb70a20f0d604dd7c4be29dd7b0011718 (diff) | |
| download | kernel_samsung_smdk4412-71a157e8edca55198e808f8561dd49017a54ee34.tar.gz kernel_samsung_smdk4412-71a157e8edca55198e808f8561dd49017a54ee34.tar.bz2 kernel_samsung_smdk4412-71a157e8edca55198e808f8561dd49017a54ee34.zip | |
of: add 'of_' prefix to machine_is_compatible()
machine is compatible is an OF-specific call. It should have
the of_ prefix to protect the global namespace.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index db379c38143..42764849eb7 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -463,8 +463,8 @@ static int __init via_pmu_dev_init(void) #endif #ifdef CONFIG_PPC32 - if (machine_is_compatible("AAPL,3400/2400") || - machine_is_compatible("AAPL,3500")) { + if (of_machine_is_compatible("AAPL,3400/2400") || + of_machine_is_compatible("AAPL,3500")) { int mb = pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_MODEL, 0); pmu_battery_count = 1; @@ -472,8 +472,8 @@ static int __init via_pmu_dev_init(void) pmu_batteries[0].flags |= PMU_BATT_TYPE_COMET; else pmu_batteries[0].flags |= PMU_BATT_TYPE_HOOPER; - } else if (machine_is_compatible("AAPL,PowerBook1998") || - machine_is_compatible("PowerBook1,1")) { + } else if (of_machine_is_compatible("AAPL,PowerBook1998") || + of_machine_is_compatible("PowerBook1,1")) { pmu_battery_count = 2; pmu_batteries[0].flags |= PMU_BATT_TYPE_SMART; pmu_batteries[1].flags |= PMU_BATT_TYPE_SMART; |