Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd958f7e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5eaf711b

drivers/staging/comedi/Makefile

+6 −9
Original line number Diff line number Diff line 
comedi-y			:= comedi_fops.o range.o drivers.o

comedi-$(CONFIG_PROC_FS)	+= proc.o

comedi-$(CONFIG_COMPAT)		+= comedi_compat32.o



obj-$(CONFIG_COMEDI)		+= comedi.o



obj-$(CONFIG_COMEDI)		+= kcomedilib/

obj-$(CONFIG_COMEDI)		+= drivers/
 


comedi-y :=		\

	comedi_fops.o	\

	proc.o		\

	range.o		\

	drivers.o	\

	comedi_compat32.o \

drivers/staging/comedi/comedi_compat32.c

+0 −4
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#include "comedi.h"

#include "comedi_compat32.h"



#ifdef CONFIG_COMPAT



#define COMEDI32_CHANINFO _IOR(CIO, 3, struct comedi32_chaninfo_struct)

#define COMEDI32_RANGEINFO _IOR(CIO, 8, struct comedi32_rangeinfo_struct)

/* N.B. COMEDI32_CMD and COMEDI_CMD ought to use _IOWR, not _IOR.
@@ -460,5 +458,3 @@ long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
{

	return raw_ioctl(file, cmd, arg);

}
 


#endif /* CONFIG_COMPAT */

drivers/staging/comedi/proc.c

+0 −2
Original line number Diff line number Diff line
@@ -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