Merge branch 'akpm' (Andrew's patch-bomb)

[karo-tx-linux.git] / drivers / platform / x86 / intel_mid_thermal.c

diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c
index 2ee9766737ea413d56e82d581444c64f1b696801..5ae9cd9c7e6e10f4da2dc254725f397286598731 100644 (file)
--- a/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@ -549,6 +549,7 @@ static int mid_thermal_remove(struct platform_device *pdev)
 
 static const struct platform_device_id therm_id_table[] = {
        { DRIVER_NAME, 1 },
+       { "msic_thermal", 1 },
        { }
 };
 
@@ -564,18 +565,7 @@ static struct platform_driver mid_thermal_driver = {
        .id_table = therm_id_table,
 };
 
-static int __init mid_thermal_module_init(void)
-{
-       return platform_driver_register(&mid_thermal_driver);
-}
-
-static void __exit mid_thermal_module_exit(void)
-{
-       platform_driver_unregister(&mid_thermal_driver);
-}
-
-module_init(mid_thermal_module_init);
-module_exit(mid_thermal_module_exit);
+module_platform_driver(mid_thermal_driver);
 
 MODULE_AUTHOR("Durgadoss R <durgadoss.r@intel.com>");
 MODULE_DESCRIPTION("Intel Medfield Platform Thermal Driver");