svn commit: r351406 - head/sys/dev/nvme

[Warner Losh]

Author: imp
Date: Thu Aug 22 21:12:51 2019
New Revision: 351406
URL: https://svnweb.freebsd.org/changeset/base/351406

Log:
  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.

Modified:
  head/sys/dev/nvme/nvme_ahci.c
  head/sys/dev/nvme/nvme_pci.c

Modified: head/sys/dev/nvme/nvme_ahci.c
==============================================================================
--- head/sys/dev/nvme/nvme_ahci.c	Thu Aug 22 20:26:20 2019	(r351405)
+++ head/sys/dev/nvme/nvme_ahci.c	Thu Aug 22 21:12:51 2019	(r351406)
@@ -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)

Modified: head/sys/dev/nvme/nvme_pci.c
==============================================================================
--- head/sys/dev/nvme/nvme_pci.c	Thu Aug 22 20:26:20 2019	(r351405)
+++ head/sys/dev/nvme/nvme_pci.c	Thu Aug 22 21:12:51 2019	(r351406)
@@ -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
 {