diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 21:24:37 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 21:24:37 (GMT) |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /fs/nfs/callback.h | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
| download | linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'fs/nfs/callback.h')
| -rw-r--r-- | fs/nfs/callback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index 07df5f1..c89d3b9 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h @@ -162,7 +162,7 @@ struct cb_layoutrecallargs { }; }; -extern unsigned nfs4_callback_layoutrecall( +extern __be32 nfs4_callback_layoutrecall( struct cb_layoutrecallargs *args, void *dummy, struct cb_process_state *cps); |