Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354181
b: refs/heads/master
c: c2f90a2
h: refs/heads/master
i:
  354179: 825919e
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Jan 25, 2013
1 parent 4eaf40c commit fc885f4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1ef0cfb192905d0e8d03d15a69b446c26d54c81f
refs/heads/master: c2f90a20c9166bf9effb064703903039a49324e3
5 changes: 1 addition & 4 deletions trunk/drivers/staging/comedi/comedidev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fc885f4

Please sign in to comment.