From 08405da98b8924eb93e7d9fa1ef32c4947d58e3e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Nov 2008 14:02:21 -0800 Subject: [PATCH] --- yaml --- r: 126727 b: refs/heads/master c: d2f63f9c67ef1a627e7b0ccd5e236272db118ceb h: refs/heads/master i: 126725: 39eaf4bfed3370256f3b10f77bbe249bc90318e7 126723: eadc112a225c491b353c75ee78b461eabb3272ab 126719: 74b1a2f94d1a1b083f448ee896996866c318d4d4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_pci.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) 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. */