diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /fs/ufs/util.h | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/ufs/util.h')
| -rw-r--r-- | fs/ufs/util.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ufs/util.h b/fs/ufs/util.h index 0466036912f1..9f8775ce381c 100644 --- a/fs/ufs/util.h +++ b/fs/ufs/util.h @@ -269,8 +269,7 @@ extern void ubh_brelse (struct ufs_buffer_head *); extern void ubh_brelse_uspi (struct ufs_sb_private_info *); extern void ubh_mark_buffer_dirty (struct ufs_buffer_head *); extern void ubh_mark_buffer_uptodate (struct ufs_buffer_head *, int); -extern void ubh_ll_rw_block(int, struct ufs_buffer_head *); -extern void ubh_wait_on_buffer (struct ufs_buffer_head *); +extern void ubh_sync_block(struct ufs_buffer_head *); extern void ubh_bforget (struct ufs_buffer_head *); extern int ubh_buffer_dirty (struct ufs_buffer_head *); #define ubh_ubhcpymem(mem,ubh,size) _ubh_ubhcpymem_(uspi,mem,ubh,size) |