staging: dgap: Remove unneeded dgap_trace.c and dgap_trace.h

Removes unneeded files dgap_trace.c and dgap_trace.h

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 13bf6fb..b7b5778 100644 (file)
--- a/drivers/staging/dgap/Makefile
+++ b/drivers/staging/dgap/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_DGAP) += dgap.o
 
 
-dgap-objs :=   dgap_driver.o \
-               dgap_trace.o 
+dgap-objs :=   dgap_driver.o 
 

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

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

diff --cc drivers/staging/dgap/dgap_trace.h
Simple merge