From 40230d4e9d707a0bf4ca2bbfda38a8042b5ad6a2 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 17 Apr 2018 16:46:08 +0000 Subject: [PATCH] Add PNP info to the PCI attahement of the puc driver. Adjust sys/conf/files and sys/modules/puc/Makefile to omit pucdata.c now tht it's included by puc_pci.c. Submitted by: Lakhan Shiva Kamireddy (with build fixes by me) Pull Request: https://github.com/freebsd/freebsd/pull/136 --- sys/conf/files | 1 - sys/dev/puc/puc_pci.c | 3 +++ sys/modules/puc/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index d680535ae0b9..b2da16980cee 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2771,7 +2771,6 @@ dev/puc/puc.c optional puc dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci -dev/puc/pucdata.c optional puc pci dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c index d6b126f0f92b..f0c6aa81dde4 100644 --- a/sys/dev/puc/puc_pci.c +++ b/sys/dev/puc/puc_pci.c @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include static int puc_msi_disable; SYSCTL_INT(_hw_puc, OID_AUTO, msi_disable, CTLFLAG_RDTUN, @@ -198,3 +199,5 @@ static driver_t puc_pci_driver = { }; DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0); +MODULE_PNP_INFO("U16:vendor;U16:device;U16:#;U16:#;D:#", pci, puc, + puc_pci_devices, sizeof(puc_pci_devices[0]), nitems(puc_pci_devices) - 1); diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile index 042ae102abef..882e33343067 100644 --- a/sys/modules/puc/Makefile +++ b/sys/modules/puc/Makefile @@ -4,7 +4,7 @@ .PATH: ${SRCTOP}/sys/dev/puc KMOD= puc -SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c pucdata.c +SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c SRCS+= bus_if.h device_if.h serdev_if.c serdev_if.h \ card_if.h pci_if.h