aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/proc.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2012-12-19 17:49:24 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-07 14:51:11 -0800
commitfd958f7eb4d0959f65377aaab4a63ba33cc53f06 (patch)
tree518cb50c95181a6450117cfd1baee5e38305d459 /drivers/staging/comedi/proc.c
parent5eaf711b53cb9977f7f54f6889c9a63d045c0ed2 (diff)
staging: comedi: Makefile: conditionally compile multi-file core module
Instead of using the #ifdef'ery in the comedi_compat32.c and proc.c files to include/exclude them from the comedi core, modify the Makefile to include those files automatically when enabled in the .config. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/proc.c')
-rw-r--r--drivers/staging/comedi/proc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index 732134f30fe..362c214bcc0 100644
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -33,7 +33,6 @@
#include <linux/proc_fs.h>
#include <linux/string.h>
-#ifdef CONFIG_PROC_FS
static int comedi_read(char *buf, char **start, off_t offset, int len,
int *eof, void *data)
{
@@ -92,4 +91,3 @@ void comedi_proc_cleanup(void)
{
remove_proc_entry("comedi", NULL);
}
-#endif