staging: dgap: Merge dgap_fep5.c into dgap_driver.c

There is a lot of cleanup work to do on these digi drivers and merging as
much as is possible will make it easier. I also notice that many merged
drivers are single source and header.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile
index b80cad5..867b1e5 100644 (file)
--- a/drivers/staging/dgap/Makefile
+++ b/drivers/staging/dgap/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_DGAP) += dgap.o
 
 
-dgap-objs :=   dgap_driver.o   dgap_fep5.o \
+dgap-objs :=   dgap_driver.o \
                dgap_parse.o    dgap_trace.o \
                dgap_sysfs.o
 

diff --cc drivers/staging/dgap/dgap_driver.c
Simple merge

diff --cc drivers/staging/dgap/dgap_fep5.c
Simple merge