diff options
author | Brian Behlendorf <[email protected]> | 2009-11-15 16:29:29 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2009-11-15 16:29:29 -0800 |
commit | 4bf915901ba23945b32da33ee3d0d3007e6fe240 (patch) | |
tree | 88d0a2e72044a6ac3444932ca3fa8c00f35bc888 /scripts | |
parent | 2eace03fe736a44af31dc760da97ceb6ddaa6bdc (diff) | |
parent | fe02742ceae8bdbeec651e8a0b61b1bd348424cd (diff) |
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/zfs-update.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/zfs-update.sh b/scripts/zfs-update.sh index ea449e7b2..abb35bc80 100755 --- a/scripts/zfs-update.sh +++ b/scripts/zfs-update.sh @@ -89,6 +89,7 @@ cp ${SRC_UTS}/intel/zfs/spa_boot.c ${DST_MOD}/zfs/ cp ${SRC_ZLIB}/*.c ${DST_MOD}/zfs/ cp ${SRC_ZLIB}/sys/*.h ${DST_MOD}/zfs/include/sys/ rm ${DST_MOD}/zfs/vdev_disk.c +rm ${DST_MOD}/zfs/zvol.c rm ${DST_MOD}/zfs/include/sys/vdev_disk.h echo "* lib/libavl" |