diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/char/rtc.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/char/rtc.c')
| -rw-r--r-- | drivers/char/rtc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index e0d0f8b2696b..bc4ab3e54550 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <linux/proc_fs.h> | 74 | #include <linux/proc_fs.h> |
| 75 | #include <linux/seq_file.h> | 75 | #include <linux/seq_file.h> |
| 76 | #include <linux/spinlock.h> | 76 | #include <linux/spinlock.h> |
| 77 | #include <linux/sched.h> | ||
| 77 | #include <linux/sysctl.h> | 78 | #include <linux/sysctl.h> |
| 78 | #include <linux/wait.h> | 79 | #include <linux/wait.h> |
| 79 | #include <linux/bcd.h> | 80 | #include <linux/bcd.h> |