diff options
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index ea319360ae6..89af44a788d 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -28,6 +28,7 @@ #include <linux/module.h> #include <linux/kdev_t.h> #include <linux/slab.h> +#include <linux/delay.h> #include <linux/errno.h> #include <linux/spinlock.h> #include <linux/mutex.h> @@ -35,10 +36,10 @@ #include <linux/mm.h> #include <linux/init.h> #include <linux/vmalloc.h> -#include "interrupt.h" #include <linux/dma-mapping.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/timer.h> #include "comedi.h" @@ -264,7 +265,6 @@ struct comedi_device { const char *board_name; const void *board_ptr; int attached; - int rt; spinlock_t spinlock; struct mutex mutex; int in_request_module; @@ -524,6 +524,17 @@ struct usb_device; /* forward declaration */ int comedi_usb_auto_config(struct usb_device *usbdev, const char *board_name); void comedi_usb_auto_unconfig(struct usb_device *usbdev); -#include "comedi_rt.h" +#ifdef CONFIG_COMEDI_PCI_DRIVERS + #define CONFIG_COMEDI_PCI +#endif +#ifdef CONFIG_COMEDI_PCI_DRIVERS_MODULE + #define CONFIG_COMEDI_PCI +#endif +#ifdef CONFIG_COMEDI_PCMCIA_DRIVERS + #define CONFIG_COMEDI_PCMCIA +#endif +#ifdef CONFIG_COMEDI_PCMCIA_DRIVERS_MODULE + #define CONFIG_COMEDI_PCMCIA +#endif #endif /* _COMEDIDEV_H */ |