diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 15:26:33 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 15:26:33 +1100 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /arch/cris/arch-v10/kernel/time.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/cris/arch-v10/kernel/time.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 9310a7b476e..525483f0ddf 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c @@ -13,7 +13,7 @@ #include <linux/swap.h> #include <linux/sched.h> #include <linux/init.h> -#include <linux/vmstat.h> +#include <linux/mm.h> #include <asm/arch/svinto.h> #include <asm/types.h> #include <asm/signal.h> |