diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 12:46:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 12:46:51 +0200 |
| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch) | |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 /fs/befs/super.c | |
| parent | dcef788eb9659b61a2110284fcce3ca6e63480d2 (diff) | |
| parent | 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
and pick up the current lineup of tracing/urgent fixes as well
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/befs/super.c')
| -rw-r--r-- | fs/befs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/befs/super.c b/fs/befs/super.c index 41f2b4d0093e..ca40f828f64d 100644 --- a/fs/befs/super.c +++ b/fs/befs/super.c @@ -8,6 +8,7 @@ */ #include <linux/fs.h> +#include <asm/page.h> /* for PAGE_SIZE */ #include "befs.h" #include "super.h" |