diff --git a/[refs] b/[refs] index 722f2d8be98d..ffc3e3bef787 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff16cab69b6ed621686cf342306785175775152d +refs/heads/master: 7aa0f1a8b1f7072990c9dc37f238c96dc6d78911 diff --git a/trunk/drivers/misc/intel_menlow.c b/trunk/drivers/misc/intel_menlow.c index 3db83a2dc3a1..5bb8816c9126 100644 --- a/trunk/drivers/misc/intel_menlow.c +++ b/trunk/drivers/misc/intel_menlow.c @@ -187,11 +187,6 @@ static int intel_menlow_memory_add(struct acpi_device *device) end: return result; - - unregister: - thermal_cooling_device_unregister(cdev); - return result; - } static int intel_menlow_memory_remove(struct acpi_device *device, int type)