diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
commit | 5d037f9064a8f3b9abbe383cdfb35e159d813711 (patch) | |
tree | 2a2445271ee818c360c42408a324d2945a6dd9f7 /include/linux/fs.h | |
parent | 64f1e00d8edb54f5d25fb0114a46050fb8340df4 (diff) | |
parent | 985b11fa8064d55d0d5a84e68667434598911bb2 (diff) |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.6
A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel. As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes. There's been good exposure in -next.
The AT91 patch fixes a build break.
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 38dba16c4176..aa110476a95b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1491,7 +1491,6 @@ struct sb_writers { | |||
1491 | struct super_block { | 1491 | struct super_block { |
1492 | struct list_head s_list; /* Keep this first */ | 1492 | struct list_head s_list; /* Keep this first */ |
1493 | dev_t s_dev; /* search index; _not_ kdev_t */ | 1493 | dev_t s_dev; /* search index; _not_ kdev_t */ |
1494 | unsigned char s_dirt; | ||
1495 | unsigned char s_blocksize_bits; | 1494 | unsigned char s_blocksize_bits; |
1496 | unsigned long s_blocksize; | 1495 | unsigned long s_blocksize; |
1497 | loff_t s_maxbytes; /* Max file size */ | 1496 | loff_t s_maxbytes; /* Max file size */ |
@@ -1861,7 +1860,6 @@ struct super_operations { | |||
1861 | int (*drop_inode) (struct inode *); | 1860 | int (*drop_inode) (struct inode *); |
1862 | void (*evict_inode) (struct inode *); | 1861 | void (*evict_inode) (struct inode *); |
1863 | void (*put_super) (struct super_block *); | 1862 | void (*put_super) (struct super_block *); |
1864 | void (*write_super) (struct super_block *); | ||
1865 | int (*sync_fs)(struct super_block *sb, int wait); | 1863 | int (*sync_fs)(struct super_block *sb, int wait); |
1866 | int (*freeze_fs) (struct super_block *); | 1864 | int (*freeze_fs) (struct super_block *); |
1867 | int (*unfreeze_fs) (struct super_block *); | 1865 | int (*unfreeze_fs) (struct super_block *); |
@@ -2397,7 +2395,6 @@ extern int vfs_fsync_range(struct file *file, loff_t start, loff_t end, | |||
2397 | int datasync); | 2395 | int datasync); |
2398 | extern int vfs_fsync(struct file *file, int datasync); | 2396 | extern int vfs_fsync(struct file *file, int datasync); |
2399 | extern int generic_write_sync(struct file *file, loff_t pos, loff_t count); | 2397 | extern int generic_write_sync(struct file *file, loff_t pos, loff_t count); |
2400 | extern void sync_supers(void); | ||
2401 | extern void emergency_sync(void); | 2398 | extern void emergency_sync(void); |
2402 | extern void emergency_remount(void); | 2399 | extern void emergency_remount(void); |
2403 | #ifdef CONFIG_BLOCK | 2400 | #ifdef CONFIG_BLOCK |