netfilter: nf_conntrack: restrict runtime expect hashsize modifications

[safe/jmp/linux-2.6] / drivers / macintosh / windfarm_pm91.c

diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c
index 9961a67..764c525 100644 (file)
--- a/drivers/macintosh/windfarm_pm91.c
+++ b/drivers/macintosh/windfarm_pm91.c
@@ -702,7 +702,7 @@ static struct platform_driver wf_smu_driver = {
         .remove = __devexit_p(wf_smu_remove),
        .driver = {
                .name = "windfarm",
-               .bus = &platform_bus_type,
+               .owner  = THIS_MODULE,
        },
 };
 
@@ -719,6 +719,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_cpufreq_clamp");
 
 #endif /* MODULE */
                platform_driver_register(&wf_smu_driver);
@@ -741,3 +742,4 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("Thermal control logic for PowerMac9,1");
 MODULE_LICENSE("GPL");
 
+MODULE_ALIAS("platform:windfarm");