Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
This commit is contained in:
commit
8cd72da031
|
@ -66,11 +66,11 @@ ${MODULE}-objs += zfs_byteswap.o
|
|||
# ${MODULE}-objs += zfs_dir.o
|
||||
${MODULE}-objs += zfs_fm.o
|
||||
# ${MODULE}-objs += zfs_fuid.o
|
||||
# ${MODULE}-objs += zfs_ioctl.o
|
||||
${MODULE}-objs += zfs_ioctl.o
|
||||
# ${MODULE}-objs += zfs_log.o
|
||||
# ${MODULE}-objs += zfs_replay.o
|
||||
# ${MODULE}-objs += zfs_rlock.o
|
||||
# ${MODULE}-objs += zfs_vfsops.o
|
||||
${MODULE}-objs += zfs_vfsops.o
|
||||
# ${MODULE}-objs += zfs_vnops.o
|
||||
${MODULE}-objs += zfs_znode.o
|
||||
${MODULE}-objs += zil.o
|
||||
|
@ -78,4 +78,4 @@ ${MODULE}-objs += zio.o
|
|||
${MODULE}-objs += zio_checksum.o
|
||||
${MODULE}-objs += zio_compress.o
|
||||
${MODULE}-objs += zio_inject.o
|
||||
# ${MODULE}-objs += zvol.o
|
||||
${MODULE}-objs += zvol.o
|
||||
|
|
Loading…
Reference in New Issue