diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index f43754bf2c04..80cd58b5ccd3 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -116,15 +116,10 @@ static driver_t amr_pci_driver = {
 	sizeof(struct amr_softc)
 };
 
-static devclass_t	amr_devclass;
-DRIVER_MODULE(amr, pci, amr_pci_driver, amr_devclass, 0, 0);
-MODULE_DEPEND(amr, pci, 1, 1, 1);
-MODULE_DEPEND(amr, cam, 1, 1, 1);
-
 static struct amr_ident
 {
-    int		vendor;
-    int		device;
+    uint16_t		vendor;
+    uint16_t		device;
     int		flags;
 #define AMR_ID_PROBE_SIG	(1<<0)	/* generic i960RD, check signature */
 #define AMR_ID_DO_SG64		(1<<1)
@@ -144,6 +139,13 @@ static struct amr_ident
     {0, 0, 0}
 };
 
+static devclass_t	amr_devclass;
+DRIVER_MODULE(amr, pci, amr_pci_driver, amr_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device", pci, amr, amr_device_ids,
+    sizeof(amr_device_ids[0]), nitems(amr_device_ids) - 1);
+MODULE_DEPEND(amr, pci, 1, 1, 1);
+MODULE_DEPEND(amr, cam, 1, 1, 1);
+
 static struct amr_ident *
 amr_find_ident(device_t dev)
 {