From 8da34c2ced288d702c3edbf21bc303e9e1675d31 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 8 May 2007 00:27:52 -0700
Subject: [PATCH] --- yaml --- r: 54631 b: refs/heads/master c:
 3367b994fe4f131ab1240600682a1981de7cad0c h: refs/heads/master i:   54629:
 99ddc2c6fa346b2e3f59039a4e03b2cdb8f64531   54627:
 38273ac619ccb315bd69cd52d781bd1f4a8e773e   54623:
 7968207ee75064fa5df05e5f6955fd830ee7dac0 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/s390/kernel/time.c | 1 +
 trunk/include/linux/cpu.h     | 3 +++
 trunk/include/linux/sched.h   | 3 ---
 trunk/include/linux/sysdev.h  | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index be2f77834636..eefd76b3b602 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28287033e12463c8ff89f1ea8038783d0360391c
+refs/heads/master: 3367b994fe4f131ab1240600682a1981de7cad0c
diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c
index 711dae8da7ad..9c2872a7cca7 100644
--- a/trunk/arch/s390/kernel/time.c
+++ b/trunk/arch/s390/kernel/time.c
@@ -21,6 +21,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/time.h>
+#include <linux/sysdev.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/smp.h>
diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h
index c22b0dfcbcd2..3b2df2523f1d 100644
--- a/trunk/include/linux/cpu.h
+++ b/trunk/include/linux/cpu.h
@@ -41,6 +41,9 @@ extern void cpu_remove_sysdev_attr(struct sysdev_attribute *attr);
 extern int cpu_add_sysdev_attr_group(struct attribute_group *attrs);
 extern void cpu_remove_sysdev_attr_group(struct attribute_group *attrs);
 
+extern struct sysdev_attribute attr_sched_mc_power_savings;
+extern struct sysdev_attribute attr_sched_smt_power_savings;
+extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern void unregister_cpu(struct cpu *cpu);
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index d9acbbb39f96..d464bd0d6578 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1641,10 +1641,7 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm)
 extern long sched_setaffinity(pid_t pid, cpumask_t new_mask);
 extern long sched_getaffinity(pid_t pid, cpumask_t *mask);
 
-#include <linux/sysdev.h>
 extern int sched_mc_power_savings, sched_smt_power_savings;
-extern struct sysdev_attribute attr_sched_mc_power_savings, attr_sched_smt_power_savings;
-extern int sched_create_sysfs_power_savings_entries(struct sysdev_class *cls);
 
 extern void normalize_rt_tasks(void);
 
diff --git a/trunk/include/linux/sysdev.h b/trunk/include/linux/sysdev.h
index 389ccf858d37..e699ab279c2c 100644
--- a/trunk/include/linux/sysdev.h
+++ b/trunk/include/linux/sysdev.h
@@ -22,6 +22,7 @@
 #define _SYSDEV_H_
 
 #include <linux/kobject.h>
+#include <linux/module.h>
 #include <linux/pm.h>