projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge cpufreq fixes going into v4.6.
[cascardo/linux.git]
/
fs
/
xfs
/
Makefile
diff --git
a/fs/xfs/Makefile
b/fs/xfs/Makefile
index
f646391
..
3542d94
100644
(file)
--- a/
fs/xfs/Makefile
+++ b/
fs/xfs/Makefile
@@
-121,4
+121,5
@@
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
xfs-$(CONFIG_SYSCTL) += xfs_sysctl.o
xfs-$(CONFIG_COMPAT) += xfs_ioctl32.o
-xfs-$(CONFIG_NFSD_PNFS) += xfs_pnfs.o
+xfs-$(CONFIG_NFSD_BLOCKLAYOUT) += xfs_pnfs.o
+xfs-$(CONFIG_NFSD_SCSILAYOUT) += xfs_pnfs.o