diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-06-19 09:17:46 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-20 19:56:55 (GMT) |
| commit | f286766e4ba899043714471a0a2c9f1474d2ab5c (patch) | |
| tree | 3251f101292d32d3be17d9dbfc50f10b3ce0fa78 /drivers/staging/comedi | |
| parent | 97ce84de8c19823ab0377a7ffc7fa25a8caa6ab8 (diff) | |
| download | linux-f286766e4ba899043714471a0a2c9f1474d2ab5c.tar.xz | |
staging: comedi: remove comedi_fops.h
Move the contents of "comedi_fops.h" into "comedi_internal.h" and delete
"comedi_fops.h". It only contains a couple of external variable
declarations (and #include <linux/types.h>) and one of those isn't even
declared in "comedi_fops.c". The other one is an external declaration
of a variable used to store a module parameter and some of those are
already externally declared in "comedi_internal.h", so they can keep it
company!
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.h | 9 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedi_internal.h | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/proc.c | 2 |
5 files changed, 5 insertions, 12 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 1079b0e..e821264 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -24,7 +24,6 @@ #undef DEBUG #define __NO_VERSION__ -#include "comedi_fops.h" #include "comedi_compat32.h" #include <linux/module.h> diff --git a/drivers/staging/comedi/comedi_fops.h b/drivers/staging/comedi/comedi_fops.h deleted file mode 100644 index d59a293..0000000 --- a/drivers/staging/comedi/comedi_fops.h +++ /dev/null @@ -1,9 +0,0 @@ - -#ifndef _COMEDI_FOPS_H -#define _COMEDI_FOPS_H -#include <linux/types.h> - -extern bool comedi_autoconfig; -extern struct comedi_driver *comedi_drivers; - -#endif /* _COMEDI_FOPS_H */ diff --git a/drivers/staging/comedi/comedi_internal.h b/drivers/staging/comedi/comedi_internal.h index b004963..e70ef051 100644 --- a/drivers/staging/comedi/comedi_internal.h +++ b/drivers/staging/comedi/comedi_internal.h @@ -1,6 +1,8 @@ #ifndef _COMEDI_INTERNAL_H #define _COMEDI_INTERNAL_H +#include <linux/types.h> + /* * various internal comedi stuff */ @@ -17,5 +19,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, extern unsigned int comedi_default_buf_size_kb; extern unsigned int comedi_default_buf_maxsize_kb; +extern bool comedi_autoconfig; +extern struct comedi_driver *comedi_drivers; #endif /* _COMEDI_INTERNAL_H */ diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index fe455e7..c0fdb00 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -24,7 +24,6 @@ #define _GNU_SOURCE #define __NO_VERSION__ -#include "comedi_fops.h" #include <linux/device.h> #include <linux/module.h> #include <linux/pci.h> diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c index 2aa487b..bb7e70e 100644 --- a/drivers/staging/comedi/proc.c +++ b/drivers/staging/comedi/proc.c @@ -30,7 +30,7 @@ #define __NO_VERSION__ #include "comedidev.h" -#include "comedi_fops.h" +#include "comedi_internal.h" #include <linux/proc_fs.h> #include <linux/string.h> |