diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/linux/lockd | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/linux/lockd')
| -rw-r--r-- | include/linux/lockd/lockd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index dcaad79f54ed..219d79627c05 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -17,13 +17,13 @@ | |||
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/kref.h> | 18 | #include <linux/kref.h> |
| 19 | #include <linux/utsname.h> | 19 | #include <linux/utsname.h> |
| 20 | #include <linux/nfsd/nfsfh.h> | ||
| 21 | #include <linux/lockd/bind.h> | 20 | #include <linux/lockd/bind.h> |
| 22 | #include <linux/lockd/xdr.h> | 21 | #include <linux/lockd/xdr.h> |
| 23 | #ifdef CONFIG_LOCKD_V4 | 22 | #ifdef CONFIG_LOCKD_V4 |
| 24 | #include <linux/lockd/xdr4.h> | 23 | #include <linux/lockd/xdr4.h> |
| 25 | #endif | 24 | #endif |
| 26 | #include <linux/lockd/debug.h> | 25 | #include <linux/lockd/debug.h> |
| 26 | #include <linux/sunrpc/svc.h> | ||
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * Version string | 29 | * Version string |