diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/topology.c | 2 | ||||
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 3d12b85b0962..067a9e8bc377 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c | |||
@@ -108,7 +108,6 @@ static int __cpuinit topology_add_dev(unsigned int cpu) | |||
108 | return rc; | 108 | return rc; |
109 | } | 109 | } |
110 | 110 | ||
111 | #ifdef CONFIG_HOTPLUG_CPU | ||
112 | static void __cpuinit topology_remove_dev(unsigned int cpu) | 111 | static void __cpuinit topology_remove_dev(unsigned int cpu) |
113 | { | 112 | { |
114 | struct sys_device *sys_dev = get_cpu_sysdev(cpu); | 113 | struct sys_device *sys_dev = get_cpu_sysdev(cpu); |
@@ -136,7 +135,6 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, | |||
136 | } | 135 | } |
137 | return rc ? NOTIFY_BAD : NOTIFY_OK; | 136 | return rc ? NOTIFY_BAD : NOTIFY_OK; |
138 | } | 137 | } |
139 | #endif | ||
140 | 138 | ||
141 | static int __cpuinit topology_sysfs_init(void) | 139 | static int __cpuinit topology_sysfs_init(void) |
142 | { | 140 | { |
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 7a7c6e6dfe4f..47ab42db122a 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -1537,7 +1537,6 @@ int cpufreq_update_policy(unsigned int cpu) | |||
1537 | } | 1537 | } |
1538 | EXPORT_SYMBOL(cpufreq_update_policy); | 1538 | EXPORT_SYMBOL(cpufreq_update_policy); |
1539 | 1539 | ||
1540 | #ifdef CONFIG_HOTPLUG_CPU | ||
1541 | static int cpufreq_cpu_callback(struct notifier_block *nfb, | 1540 | static int cpufreq_cpu_callback(struct notifier_block *nfb, |
1542 | unsigned long action, void *hcpu) | 1541 | unsigned long action, void *hcpu) |
1543 | { | 1542 | { |
@@ -1577,7 +1576,6 @@ static struct notifier_block __cpuinitdata cpufreq_cpu_notifier = | |||
1577 | { | 1576 | { |
1578 | .notifier_call = cpufreq_cpu_callback, | 1577 | .notifier_call = cpufreq_cpu_callback, |
1579 | }; | 1578 | }; |
1580 | #endif /* CONFIG_HOTPLUG_CPU */ | ||
1581 | 1579 | ||
1582 | /********************************************************************* | 1580 | /********************************************************************* |
1583 | * REGISTER / UNREGISTER CPUFREQ DRIVER * | 1581 | * REGISTER / UNREGISTER CPUFREQ DRIVER * |