Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

2009-03-10 21:51:08 -07:00 · 2009-03-10 21:51:08 -07:00 · 1f658021cb
parent 13ccdbc01e 851cd16a32
commit 1f658021cb
4 changed files with 1 additions and 5 deletions
--- a/configure.ac
+++ b/configure.ac
@ -77,7 +77,6 @@ AC_CONFIG_FILES([
 	module/zcommon/Makefile
 	module/zfs/Makefile
 	module/zpios/Makefile
-	module/zpios/include/Makefile
 	scripts/Makefile
 	scripts/zpool-config/Makefile
 	scripts/zpios-test/Makefile
--- a/module/Makefile.in
+++ b/module/Makefile.in
@ -3,6 +3,7 @@ subdir-m += nvpair
 subdir-m += unicode
 subdir-m += zcommon
 subdir-m += zfs
+subdir-m += zpios

 modules clean:
 	# Make the exported SPL symbols available to these modules.
--- a/module/zpios/Makefile.in
+++ b/module/zpios/Makefile.in
@ -1,6 +1,3 @@
-subdir-m += include
-DISTFILES = zpios.c
-
 MODULE := zpios

 EXTRA_CFLAGS  = -I@MODDIR@/zfs/include
--- a/module/zpios/include/Makefile.in
+++ b/module/zpios/include/Makefile.in
@ -1 +0,0 @@
-DISTFILES = zpios-ctl.h zpios-internal.h