From 2d43fab9c299e61c3a751b38dbd51804e4899631 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 22 Aug 2019 21:12:51 +0000
Subject: [PATCH] We need to define version 1 of nvme, not nvme_foo. Otherwise
 nvd won't load and people who pull in nvme/nvd from modules can't load nvd.ko
 since it depends on nvme, not nvme_foo. The duplicate doesn't matter since
 kldxref properly handles that case.

---
 sys/dev/nvme/nvme_ahci.c | 3 ++-
 sys/dev/nvme/nvme_pci.c  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c
index adfa35991e5..29c40d919a7 100644
--- a/sys/dev/nvme/nvme_ahci.c
+++ b/sys/dev/nvme/nvme_ahci.c
@@ -55,7 +55,8 @@ static driver_t nvme_ahci_driver = {
 };
 
 DRIVER_MODULE(nvme, ahci, nvme_ahci_driver, nvme_devclass, NULL, 0);
-MODULE_VERSION(nvme_ahci, 1);
+MODULE_VERSION(nvme, 1);
+MODULE_DEPEND(nvme, cam, 1, 1, 1);
 
 static int
 nvme_ahci_probe (device_t device)
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index 8b87f6a8eda..0d4923910ff 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -62,7 +62,8 @@ static driver_t nvme_pci_driver = {
 };
 
 DRIVER_MODULE(nvme, pci, nvme_pci_driver, nvme_devclass, NULL, 0);
-MODULE_VERSION(nvme_pci, 1);
+MODULE_VERSION(nvme, 1);
+MODULE_DEPEND(nvme, cam, 1, 1, 1);
 
 static struct _pcsid
 {