diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-11 04:58:01 -0400 |
commit | 4894e4aca82aca927d0404ce61f021f790de4b1e (patch) | |
tree | bbe0d083829f5858295298f188d885367cf4b1f6 /include/linux/romfs_fs.h | |
parent | 05e882f890038c702a4f15d385135d03cf74ad48 (diff) | |
parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) |
Merge commit 'v2.6.30' into next
Diffstat (limited to 'include/linux/romfs_fs.h')
-rw-r--r-- | include/linux/romfs_fs.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/romfs_fs.h b/include/linux/romfs_fs.h index e20bbf9eb365..c490fbc43fe2 100644 --- a/include/linux/romfs_fs.h +++ b/include/linux/romfs_fs.h | |||
@@ -53,9 +53,4 @@ struct romfs_inode { | |||
53 | #define ROMFH_PAD (ROMFH_SIZE-1) | 53 | #define ROMFH_PAD (ROMFH_SIZE-1) |
54 | #define ROMFH_MASK (~ROMFH_PAD) | 54 | #define ROMFH_MASK (~ROMFH_PAD) |
55 | 55 | ||
56 | #ifdef __KERNEL__ | ||
57 | |||
58 | /* Not much now */ | ||
59 | |||
60 | #endif /* __KERNEL__ */ | ||
61 | #endif | 56 | #endif |