diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
tree | 2624a44924c625c367f3cebf937853b9da2de282 /fs/block_dev.c | |
parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 7f7600e2381c..9633a490dab0 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -5,14 +5,12 @@ | |||
5 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE | 5 | * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | ||
9 | #include <linux/init.h> | 8 | #include <linux/init.h> |
10 | #include <linux/mm.h> | 9 | #include <linux/mm.h> |
11 | #include <linux/fcntl.h> | 10 | #include <linux/fcntl.h> |
12 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
13 | #include <linux/kmod.h> | 12 | #include <linux/kmod.h> |
14 | #include <linux/major.h> | 13 | #include <linux/major.h> |
15 | #include <linux/devfs_fs_kernel.h> | ||
16 | #include <linux/smp_lock.h> | 14 | #include <linux/smp_lock.h> |
17 | #include <linux/highmem.h> | 15 | #include <linux/highmem.h> |
18 | #include <linux/blkdev.h> | 16 | #include <linux/blkdev.h> |