Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
1f658021cb
|
@ -77,7 +77,6 @@ AC_CONFIG_FILES([
|
||||||
module/zcommon/Makefile
|
module/zcommon/Makefile
|
||||||
module/zfs/Makefile
|
module/zfs/Makefile
|
||||||
module/zpios/Makefile
|
module/zpios/Makefile
|
||||||
module/zpios/include/Makefile
|
|
||||||
scripts/Makefile
|
scripts/Makefile
|
||||||
scripts/zpool-config/Makefile
|
scripts/zpool-config/Makefile
|
||||||
scripts/zpios-test/Makefile
|
scripts/zpios-test/Makefile
|
||||||
|
|
|
@ -3,6 +3,7 @@ subdir-m += nvpair
|
||||||
subdir-m += unicode
|
subdir-m += unicode
|
||||||
subdir-m += zcommon
|
subdir-m += zcommon
|
||||||
subdir-m += zfs
|
subdir-m += zfs
|
||||||
|
subdir-m += zpios
|
||||||
|
|
||||||
modules clean:
|
modules clean:
|
||||||
# Make the exported SPL symbols available to these modules.
|
# Make the exported SPL symbols available to these modules.
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
subdir-m += include
|
|
||||||
DISTFILES = zpios.c
|
|
||||||
|
|
||||||
MODULE := zpios
|
MODULE := zpios
|
||||||
|
|
||||||
EXTRA_CFLAGS = -I@MODDIR@/zfs/include
|
EXTRA_CFLAGS = -I@MODDIR@/zfs/include
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
DISTFILES = zpios-ctl.h zpios-internal.h
|
|
Loading…
Reference in New Issue