aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-19 14:54:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-19 14:54:52 -0700
commitc6f5c93098f5577210f8f3ea22209b3f266c66af (patch)
treebc641dfb6f71b6584cedde4b6721ca716f8bf3d0 /include
parent19853301ef3289bda2d5264c1093e74efddaeab9 (diff)
parentd22053cdbd914a6c97ea101adf411a8fd7e282ad (diff)
downloadlinux-linaro-stable-c6f5c93098f5577210f8f3ea22209b3f266c66af.tar.gz
Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from J. Bruce Fields: "One bugfix, and one minor header fix from Jeff Layton while we're here" * 'for-3.4' of git://linux-nfs.org/~bfields/linux: nfsd: include cld.h in the headers_install target nfsd: don't fail unchecked creates of non-special files
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfsd/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index b8d4001212b3..5b7d84ac954a 100644
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -1,3 +1,4 @@
+header-y += cld.h
header-y += debug.h
header-y += export.h
header-y += nfsfh.h