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

2009-01-05 11:22:20 -08:00 · 2009-01-05 11:22:20 -08:00 · ccdf64be3b
parent e908f1b867 6fd7b17036
commit ccdf64be3b
2 changed files with 1 additions and 2 deletions
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@ -1 +1 @@
-SUBDIRS = zfs zpool zdb zdump zinject ztest
+SUBDIRS = zfs zpool zdb zinject ztest
--- a/configure.ac
+++ b/configure.ac
@ -69,7 +69,6 @@ AC_CONFIG_FILES([
 	lib/libzfs/Makefile
 	cmd/Makefile
 	cmd/zdb/Makefile
-	cmd/zdump/Makefile
 	cmd/zfs/Makefile
 	cmd/zinject/Makefile
 	cmd/zpool/Makefile