Commit 726dd505 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: cb_das16_cs: remove CONFIG_PCMCIA check

The Kconfig ensures that this driver can only be build it PCMCIA is
enabled. Remove the unneeded '#if defined (CONFIG_PCMCIA) ,,,' and
the '#else' code.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7719881
...@@ -629,8 +629,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev, ...@@ -629,8 +629,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
======================================================================*/ ======================================================================*/
#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
static void das16cs_pcmcia_config(struct pcmcia_device *link); static void das16cs_pcmcia_config(struct pcmcia_device *link);
static void das16cs_pcmcia_release(struct pcmcia_device *link); static void das16cs_pcmcia_release(struct pcmcia_device *link);
static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev); static int das16cs_pcmcia_suspend(struct pcmcia_device *p_dev);
...@@ -813,18 +811,3 @@ void __exit cleanup_module(void) ...@@ -813,18 +811,3 @@ void __exit cleanup_module(void)
exit_das16cs_pcmcia_cs(); exit_das16cs_pcmcia_cs();
comedi_driver_unregister(&driver_das16cs); comedi_driver_unregister(&driver_das16cs);
} }
#else
static int __init driver_das16cs_init_module(void)
{
return comedi_driver_register(&driver_das16cs);
}
static void __exit driver_das16cs_cleanup_module(void)
{
comedi_driver_unregister(&driver_das16cs);
}
module_init(driver_das16cs_init_module);
module_exit(driver_das16cs_cleanup_module);
#endif /* CONFIG_PCMCIA */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment