diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-01 23:34:14 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-09 10:33:00 -0500 |
commit | 71a157e8edca55198e808f8561dd49017a54ee34 (patch) | |
tree | a78185ea8204f1e375d88545235ba3d4937ebfaf /drivers/macintosh/therm_pm72.c | |
parent | 89751a7cb70a20f0d604dd7c4be29dd7b0011718 (diff) |
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/therm_pm72.c')
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 454bc501df3c..5738d8bf2d97 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -1899,7 +1899,7 @@ static int create_control_loops(void) | |||
1899 | */ | 1899 | */ |
1900 | if (rackmac) | 1900 | if (rackmac) |
1901 | cpu_pid_type = CPU_PID_TYPE_RACKMAC; | 1901 | cpu_pid_type = CPU_PID_TYPE_RACKMAC; |
1902 | else if (machine_is_compatible("PowerMac7,3") | 1902 | else if (of_machine_is_compatible("PowerMac7,3") |
1903 | && (cpu_count > 1) | 1903 | && (cpu_count > 1) |
1904 | && fcu_fans[CPUA_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID | 1904 | && fcu_fans[CPUA_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID |
1905 | && fcu_fans[CPUB_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID) { | 1905 | && fcu_fans[CPUB_PUMP_RPM_INDEX].id != FCU_FAN_ABSENT_ID) { |
@@ -2234,10 +2234,10 @@ static int __init therm_pm72_init(void) | |||
2234 | { | 2234 | { |
2235 | struct device_node *np; | 2235 | struct device_node *np; |
2236 | 2236 | ||
2237 | rackmac = machine_is_compatible("RackMac3,1"); | 2237 | rackmac = of_machine_is_compatible("RackMac3,1"); |
2238 | 2238 | ||
2239 | if (!machine_is_compatible("PowerMac7,2") && | 2239 | if (!of_machine_is_compatible("PowerMac7,2") && |
2240 | !machine_is_compatible("PowerMac7,3") && | 2240 | !of_machine_is_compatible("PowerMac7,3") && |
2241 | !rackmac) | 2241 | !rackmac) |
2242 | return -ENODEV; | 2242 | return -ENODEV; |
2243 | 2243 | ||