diff --git a/[refs] b/[refs] index 35223dc6b202..aafd7ab6e3c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1f281350ca1ba1f740ced203136d27390b22c1 +refs/heads/master: d2f63f9c67ef1a627e7b0ccd5e236272db118ceb diff --git a/trunk/drivers/staging/comedi/drivers/comedi_pci.h b/trunk/drivers/staging/comedi/drivers/comedi_pci.h index 09c9a4435367..c14a036a0536 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_pci.h +++ b/trunk/drivers/staging/comedi/drivers/comedi_pci.h @@ -28,19 +28,6 @@ #include -/* - * Called to disable PCI device if PCI device has been enabled, but - * PCI regions have not been reserved. - * - * It only disables the PCI device if the kernel supports reference - * counting of PCI enables, otherwise it might stop the device working - * in another driver instance. - */ -static inline void comedi_pci_disable_no_regions(struct pci_dev *pdev) -{ - pci_disable_device(pdev); -} - /* * Enable the PCI device and request the regions. */