Commit ce17d12e authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://are.twiddle.net/tga-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 14806dfc 17edb896
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/nls.h> #include <linux/nls.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/statfs.h> #include <linux/vfs.h>
#include "befs.h" #include "befs.h"
#include "btree.h" #include "btree.h"
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/vfs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment