Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2009-01-06 09:31:02 -08:00
commit 802acd05cf
1 changed files with 1 additions and 1 deletions

View File

@ -73,7 +73,7 @@ ${MODULE}-objs += zfs_acl.o
# ${MODULE}-objs += zfs_ctldir.o
# ${MODULE}-objs += zfs_dir.o
${MODULE}-objs += zfs_fm.o
${MODULE}-objs += zfs_fuid.o
# ${MODULE}-objs += zfs_fuid.o
# ${MODULE}-objs += zfs_ioctl.o
# ${MODULE}-objs += zfs_log.o
# ${MODULE}-objs += zfs_replay.o