mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 10:31:46 +09:00
staging: comedi: comedidev.h: remove some #ifdefs
Some declarations and macro definitions in "comedidev.h" are protected by various `#ifdef`s for kernel configuration options, but the header file compiles fine without the `#ifdef`s regardless of whether those config option macros are defined or not. Remove the `#ifdef`s and compile the affected code unconditionally. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5aa1491a63
commit
d51b365101
@@ -558,8 +558,6 @@ void comedi_driver_unregister(struct comedi_driver *);
|
||||
module_driver(__comedi_driver, comedi_driver_register, \
|
||||
comedi_driver_unregister)
|
||||
|
||||
#ifdef CONFIG_COMEDI_PCI_DRIVERS
|
||||
|
||||
/* comedi_pci.c - comedi PCI driver specific functions */
|
||||
|
||||
/*
|
||||
@@ -603,10 +601,6 @@ void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);
|
||||
module_driver(__comedi_driver, comedi_pci_driver_register, \
|
||||
comedi_pci_driver_unregister, &(__pci_driver))
|
||||
|
||||
#endif /* CONFIG_COMEDI_PCI_DRIVERS */
|
||||
|
||||
#ifdef CONFIG_COMEDI_PCMCIA_DRIVERS
|
||||
|
||||
/* comedi_pcmcia.c - comedi PCMCIA driver specific functions */
|
||||
|
||||
struct pcmcia_driver;
|
||||
@@ -640,10 +634,6 @@ void comedi_pcmcia_driver_unregister(struct comedi_driver *,
|
||||
module_driver(__comedi_driver, comedi_pcmcia_driver_register, \
|
||||
comedi_pcmcia_driver_unregister, &(__pcmcia_driver))
|
||||
|
||||
#endif /* CONFIG_COMEDI_PCMCIA_DRIVERS */
|
||||
|
||||
#ifdef CONFIG_COMEDI_USB_DRIVERS
|
||||
|
||||
/* comedi_usb.c - comedi USB driver specific functions */
|
||||
|
||||
struct usb_driver;
|
||||
@@ -673,6 +663,4 @@ void comedi_usb_driver_unregister(struct comedi_driver *, struct usb_driver *);
|
||||
module_driver(__comedi_driver, comedi_usb_driver_register, \
|
||||
comedi_usb_driver_unregister, &(__usb_driver))
|
||||
|
||||
#endif /* CONFIG_COMEDI_USB_DRIVERS */
|
||||
|
||||
#endif /* _COMEDIDEV_H */
|
||||
|
||||
Reference in New Issue
Block a user