diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-11-25 10:48:00 -0800 |
| commit | 27f6cbecbf60e2dd2be49a945e9966ed6b20b2de (patch) | |
| tree | 2416ab37445ec5ec8e669016a2d1f5573863d73c /kernel/timer.c | |
| parent | 7cf095f46f0ca52773a431db8ac0bf4a07a3501b (diff) | |
| parent | eb1852b10593dc3ca73e02bf9ac4753a5a464905 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 8cff36119e4d..dbaa62422b13 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -20,7 +20,7 @@ */ #include <linux/kernel_stat.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/percpu.h> #include <linux/init.h> |