Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[pandora-kernel.git] / drivers / staging / comedi / drivers / 8255.h

diff --git a/drivers/staging/comedi/drivers/8255.h b/drivers/staging/comedi/drivers/8255.h
index 02c5a36..b6314c9 100644 (file)
--- a/drivers/staging/comedi/drivers/8255.h
+++ b/drivers/staging/comedi/drivers/8255.h
@@ -26,8 +26,6 @@
 
 #include "../comedidev.h"
 
-#if defined(CONFIG_COMEDI_8255) || defined(CONFIG_COMEDI_8255_MODULE)
-
 int subdev_8255_init(struct comedi_device *dev, struct comedi_subdevice *s,
                     int (*cb) (int, int, int, unsigned long),
                     unsigned long arg);
@@ -38,24 +36,4 @@ void subdev_8255_cleanup(struct comedi_device *dev, struct comedi_subdevice *s);
 void subdev_8255_interrupt(struct comedi_device *dev,
                           struct comedi_subdevice *s);
 
-#else
-
-static inline int subdev_8255_init(struct comedi_device *dev,
-                                  struct comedi_subdevice *s, void *x,
-                                  unsigned long y)
-{
-       printk("8255 support not configured -- disabling subdevice\n");
-
-       s->type = COMEDI_SUBD_UNUSED;
-
-       return 0;
-}
-
-static inline void subdev_8255_cleanup(struct comedi_device *dev,
-                                      struct comedi_subdevice *s)
-{
-}
-
-#endif
-
 #endif