From: Satyam Sharma <satyam@infradead.org>

The CPU hotplug notifier_block coretemp_cpu_notifier is already defined
inside an #ifdef HOTPLUG_CPU, therefore marking it as __cpuinitdata is
quite a pointless thing to do.

Also, remove duplicate prototype of function coretemp_update_device() at
the top of this file (another one already exists barely 10 lines above this
one :-)

Signed-off-by: Satyam Sharma <satyam@infradead.org>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Mark Hoffman <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/hwmon/coretemp.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN drivers/hwmon/coretemp.c~hwmon-coretemp-remove-bogus-__cpuinitdata-etc-cleanup drivers/hwmon/coretemp.c
--- a/drivers/hwmon/coretemp.c~hwmon-coretemp-remove-bogus-__cpuinitdata-etc-cleanup
+++ a/drivers/hwmon/coretemp.c
@@ -58,8 +58,6 @@ struct coretemp_data {
 	u8 alarm;
 };
 
-static struct coretemp_data *coretemp_update_device(struct device *dev);
-
 /*
  * Sysfs stuff
  */
@@ -350,7 +348,7 @@ static int coretemp_cpu_callback(struct 
 	return NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata coretemp_cpu_notifier = {
+static struct notifier_block coretemp_cpu_notifier = {
 	.notifier_call = coretemp_cpu_callback,
 };
 #endif				/* !CONFIG_HOTPLUG_CPU */
_