diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:44 +0200 |
commit | b226f744d40b052ac126c4cb16c76f66e5185128 (patch) | |
tree | e86f5c059dde241472689cbe2d55429cd15b2d56 /drivers/char/genrtc.c | |
parent | d5b889f2ecec7849e851ddd31c34bdfb3482b5de (diff) | |
parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
download | linux-b226f744d40b052ac126c4cb16c76f66e5185128.tar.gz linux-b226f744d40b052ac126c4cb16c76f66e5185128.tar.bz2 linux-b226f744d40b052ac126c4cb16c76f66e5185128.zip |
Merge branch 'linus' into perf/core
Merge reason: pick up tools/perf/ changes from upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char/genrtc.c')
-rw-r--r-- | drivers/char/genrtc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c index aac0985a572b..31e7c91c2d9d 100644 --- a/drivers/char/genrtc.c +++ b/drivers/char/genrtc.c @@ -43,6 +43,7 @@ #define RTC_VERSION "1.07" #include <linux/module.h> +#include <linux/sched.h> #include <linux/errno.h> #include <linux/miscdevice.h> #include <linux/fcntl.h> |