diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/linux/reiserfs_xattr.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/linux/reiserfs_xattr.h')
| -rw-r--r-- | include/linux/reiserfs_xattr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h index 5353afb11db3..5e961035c725 100644 --- a/include/linux/reiserfs_xattr.h +++ b/include/linux/reiserfs_xattr.h | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | File: linux/reiserfs_xattr.h | 2 | File: linux/reiserfs_xattr.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <linux/init.h> | ||
| 7 | #include <linux/xattr.h> | 5 | #include <linux/xattr.h> |
| 8 | 6 | ||
| 9 | /* Magic value in header */ | 7 | /* Magic value in header */ |
| @@ -15,6 +13,7 @@ struct reiserfs_xattr_header { | |||
| 15 | }; | 13 | }; |
| 16 | 14 | ||
| 17 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
| 16 | #include <linux/init.h> | ||
| 18 | 17 | ||
| 19 | struct reiserfs_xattr_handler { | 18 | struct reiserfs_xattr_handler { |
| 20 | char *prefix; | 19 | char *prefix; |