git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[sfrench/cifs-2.6.git]
/
include
/
linux
/
fs.h
diff --git
a/include/linux/fs.h
b/include/linux/fs.h
index 7cf0c54a46a7fff64365b3184ea492d572dac9b0..b3ae77cccbb6723499e094ec01cd4660607fcee7 100644
(file)
--- a/
include/linux/fs.h
+++ b/
include/linux/fs.h
@@
-938,6
+938,7
@@
struct super_block {
struct list_head s_files;
struct block_device *s_bdev;
+ struct mtd_info *s_mtd;
struct list_head s_instances;
struct quota_info s_dquot; /* Diskquota specific options */