From fc885f4ed0c8b20c0e34824747fe36f3b12e0206 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Wed, 23 Jan 2013 00:03:30 +0100 Subject: [PATCH] --- yaml --- r: 354181 b: refs/heads/master c: c2f90a20c9166bf9effb064703903039a49324e3 h: refs/heads/master i: 354179: 825919ea52737a8218f47f6d5c25bd1693f7991d v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 5 +---- trunk/drivers/staging/comedi/drivers.c | 6 ++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1014e3ae1f0d..4b5c0f431dba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ef0cfb192905d0e8d03d15a69b446c26d54c81f +refs/heads/master: c2f90a20c9166bf9effb064703903039a49324e3 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 6211d440e457..e2b7d606e1c0 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -484,10 +484,7 @@ static inline int comedi_pci_auto_config(struct pci_dev *pcidev, return comedi_auto_config(&pcidev->dev, driver, 0); } -static inline void comedi_pci_auto_unconfig(struct pci_dev *pcidev) -{ - comedi_auto_unconfig(&pcidev->dev); -} +void comedi_pci_auto_unconfig(struct pci_dev *pcidev); static inline int comedi_usb_auto_config(struct usb_interface *intf, struct comedi_driver *driver) diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 1c7d4da9775a..87eeee58bda7 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -558,6 +558,12 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver, } EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); +void comedi_pci_auto_unconfig(struct pci_dev *pcidev) +{ + comedi_auto_unconfig(&pcidev->dev); +} +EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig); + #if IS_ENABLED(CONFIG_PCMCIA) int comedi_pcmcia_driver_register(struct comedi_driver *comedi_driver, struct pcmcia_driver *pcmcia_driver)