git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
of: add 'of_' prefix to machine_is_compatible()
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
windfarm_pm81.c
diff --git
a/drivers/macintosh/windfarm_pm81.c
b/drivers/macintosh/windfarm_pm81.c
index
2a94485
..
565d5b2
100644
(file)
--- a/
drivers/macintosh/windfarm_pm81.c
+++ b/
drivers/macintosh/windfarm_pm81.c
@@
-770,7
+770,7
@@
static struct platform_driver wf_smu_driver = {
.remove = __devexit_p(wf_smu_remove),
.driver = {
.name = "windfarm",
.remove = __devexit_p(wf_smu_remove),
.driver = {
.name = "windfarm",
- .
bus = &platform_bus_type
,
+ .
owner = THIS_MODULE
,
},
};
},
};
@@
-779,8
+779,8
@@
static int __init wf_smu_init(void)
{
int rc = -ENODEV;
{
int rc = -ENODEV;
- if (machine_is_compatible("PowerMac8,1") ||
- machine_is_compatible("PowerMac8,2"))
+ if (
of_
machine_is_compatible("PowerMac8,1") ||
+
of_
machine_is_compatible("PowerMac8,2"))
rc = wf_init_pm();
if (rc == 0) {
rc = wf_init_pm();
if (rc == 0) {
@@
-788,6
+788,7
@@
static int __init wf_smu_init(void)
request_module("windfarm_smu_controls");
request_module("windfarm_smu_sensors");
request_module("windfarm_lm75_sensor");
request_module("windfarm_smu_controls");
request_module("windfarm_smu_sensors");
request_module("windfarm_lm75_sensor");
+ request_module("windfarm_cpufreq_clamp");
#endif /* MODULE */
platform_driver_register(&wf_smu_driver);
#endif /* MODULE */
platform_driver_register(&wf_smu_driver);
@@
-809,4
+810,4
@@
module_exit(wf_smu_exit);
MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
MODULE_DESCRIPTION("Thermal control logic for iMac G5");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
MODULE_DESCRIPTION("Thermal control logic for iMac G5");
MODULE_LICENSE("GPL");
-
+MODULE_ALIAS("platform:windfarm");