From: Mark Hounschell Date: Wed, 19 Feb 2014 18:12:00 +0000 (-0500) Subject: staging: dgap: Merge dgap_fep5.c into dgap_driver.c X-Git-Tag: v3.15-rc1~139^2~903 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b053bb86a96e49761b36a1f7c9cec1d7f8de0c08;p=pandora-kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile index b80cad5f95c5..867b1e5d6fcb 100644 --- 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 Reading git-diff-tree failed