diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /fs/squashfs/id.c | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'fs/squashfs/id.c')
| -rw-r--r-- | fs/squashfs/id.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/squashfs/id.c b/fs/squashfs/id.c index b7f64bcd2b70..d8f32452638e 100644 --- a/fs/squashfs/id.c +++ b/fs/squashfs/id.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | 37 | ||
| 38 | #include "squashfs_fs.h" | 38 | #include "squashfs_fs.h" |
| 39 | #include "squashfs_fs_sb.h" | 39 | #include "squashfs_fs_sb.h" |
| 40 | #include "squashfs_fs_i.h" | ||
| 41 | #include "squashfs.h" | 40 | #include "squashfs.h" |
| 42 | 41 | ||
| 43 | /* | 42 | /* |