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/udf | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/super.c | 1 | ||||
| -rw-r--r-- | fs/udf/udfdecl.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 44fe2cb0bbb2..4df822c881b6 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | 40 | ||
| 41 | #include "udfdecl.h" | 41 | #include "udfdecl.h" |
| 42 | 42 | ||
| 43 | #include <linux/config.h> | ||
| 44 | #include <linux/blkdev.h> | 43 | #include <linux/blkdev.h> |
| 45 | #include <linux/slab.h> | 44 | #include <linux/slab.h> |
| 46 | #include <linux/kernel.h> | 45 | #include <linux/kernel.h> |
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 2f992387cc9e..1033b7cf2939 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include "osta_udf.h" | 6 | #include "osta_udf.h" |
| 7 | 7 | ||
| 8 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 11 | #include <linux/udf_fs_i.h> | 10 | #include <linux/udf_fs_i.h> |
| 12 | #include <linux/udf_fs_sb.h> | 11 | #include <linux/udf_fs_sb.h> |