diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 19:21:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 19:21:50 -0400 |
commit | 5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (patch) | |
tree | 09831b553687b51749ed99dbabaf3687a4e4bd2a /include/linux/nfsd | |
parent | fc58fb180755cdeda3ce58776eef94a01b37a1c1 (diff) | |
parent | 8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
defconfig reduction
kbuild: drop unifdef-y support
archs: replace unifdef-y with header-y
include: replace unifdef-y with header-y
Diffstat (limited to 'include/linux/nfsd')
-rw-r--r-- | include/linux/nfsd/Kbuild | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild index fc972048e572..55d1467de3c1 100644 --- a/include/linux/nfsd/Kbuild +++ b/include/linux/nfsd/Kbuild | |||
@@ -1,6 +1,6 @@ | |||
1 | unifdef-y += const.h | 1 | header-y += const.h |
2 | unifdef-y += debug.h | 2 | header-y += debug.h |
3 | unifdef-y += export.h | 3 | header-y += export.h |
4 | unifdef-y += nfsfh.h | 4 | header-y += nfsfh.h |
5 | unifdef-y += stats.h | 5 | header-y += stats.h |
6 | unifdef-y += syscall.h | 6 | header-y += syscall.h |