diff options
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/ath10k/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/ath11k/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/ath12k/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_config.h | 7 | ||||
| -rw-r--r-- | sys/modules/zfs/zfs_gitrev.h | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index b28df768c3d5..becf42a6a79a 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -1,3 +1,5 @@ +.include <kmod.opts.mk> + DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index a2f0064c2ae9..eaf196af5b55 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -1,3 +1,5 @@ +.include <kmod.opts.mk> + DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index ecca0bc3b409..071bb88a8b37 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -1,3 +1,5 @@ +.include <kmod.opts.mk> + DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index 77c310c268f8..b4e4c1e4d29b 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -204,6 +204,9 @@ /* DECLARE_EVENT_CLASS() is available */ /* #undef HAVE_DECLARE_EVENT_CLASS */ +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + /* 3-arg dequeue_signal() takes a type argument */ /* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ @@ -911,7 +914,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-551-FreeBSD_g84ffe564d" +#define ZFS_META_ALIAS "zfs-2.4.99-566-FreeBSD_ga12c6ed62" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -941,7 +944,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "551-FreeBSD_g84ffe564d" +#define ZFS_META_RELEASE "566-FreeBSD_ga12c6ed62" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index af9caaa07622..113c3d7a5bbb 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.99-551-g84ffe564d-dirty" +#define ZFS_META_GITREV "zfs-2.4.99-566-ga12c6ed62-dirty" |
