Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311155
b: refs/heads/master
c: 78b1061
h: refs/heads/master
i:
  311153: e942140
  311151: 3222b2b
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Jun 11, 2012
1 parent e59ecbf commit 5b02d97
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: afb6a6a01b51b6712485ea045e2b882061d250d9
refs/heads/master: 78b10615ad295393a7d66ea57218171c0a07c059
5 changes: 5 additions & 0 deletions trunk/drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <linux/pci.h>
#include <linux/usb.h>
#include <linux/errno.h>
#include <linux/kconfig.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/fcntl.h>
Expand Down Expand Up @@ -981,6 +982,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver,
}
EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);

#if IS_ENABLED(CONFIG_USB)

static int comedi_old_usb_auto_config(struct usb_interface *intf,
struct comedi_driver *driver)
{
Expand Down Expand Up @@ -1043,3 +1046,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver,
comedi_driver_unregister(comedi_driver);
}
EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister);

#endif

0 comments on commit 5b02d97

Please sign in to comment.