diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-03 21:01:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-03 21:01:46 -0700 |
| commit | ab2aaf93509ee65c1010bc5eed34a2413d69b382 (patch) | |
| tree | a3e8331e5052c7e653a00d6f843d03d66b38a5da /drivers | |
| parent | 20db71733ee827bcf7d374097ce0320e74654b0c (diff) | |
| parent | 757858cc00018e47a12f1ce21be8f557ea4334a9 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/oprofile/timer_int.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c index 1dec3978d7da..3e8c44b2eff2 100644 --- a/drivers/oprofile/timer_int.c +++ b/drivers/oprofile/timer_int.c @@ -12,6 +12,8 @@ #include <linux/smp.h> #include <linux/irq.h> #include <linux/oprofile.h> +#include <linux/profile.h> +#include <linux/init.h> #include <asm/ptrace.h> static int timer_notify(struct notifier_block * self, unsigned long val, void * data) |