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

This commit is contained in:
Brian Behlendorf 2008-12-22 10:37:28 -08:00
commit 1bfbc7e5ba
2 changed files with 3 additions and 0 deletions

View File

@ -59,6 +59,7 @@ libzpool_la_SOURCES = \
${top_srcdir}/module/zfs/spa_history.c \
${top_srcdir}/module/zfs/zfs_fm.c \
${top_srcdir}/module/zfs/zfs_byteswap.c \
${top_srcdir}/module/zfs/zfs_fuid.c \
${top_srcdir}/module/zfs/zio.c \
${top_srcdir}/module/zfs/zio_checksum.c \
${top_srcdir}/module/zfs/fletcher.c \

View File

@ -60,6 +60,8 @@ ${MODULE}-objs += spa_errlog.o # Log of persistent pool-wide data errors
${MODULE}-objs += spa_history.o # Command history support
${MODULE}-objs += spa_boot.o # Bootable root partitions
${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support
${MODULE}-objs += zfs_byteswap.c # XXX: ?
${MODULE}-objs += zfs_fuid.c # XXX: ?
# ZIO (ZFS I/O Pipeline)
${MODULE}-objs += zio.o # Interfaces zio core