From: Mark Hounschell Date: Wed, 19 Feb 2014 18:11:59 +0000 (-0500) Subject: staging: dgap: Merge dgap_tty.c into dgap_driver.c X-Git-Tag: v3.15-rc1~139^2~904 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6792a3e6e39ac300069ecbf4f4be1c9dc8a71ab;p=pandora-kernel.git staging: dgap: Merge dgap_tty.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 Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/Makefile b/drivers/staging/dgap/Makefile index 3abe8d2bb748..b80cad5f95c5 100644 --- a/drivers/staging/dgap/Makefile +++ b/drivers/staging/dgap/Makefile @@ -3,5 +3,5 @@ obj-$(CONFIG_DGAP) += dgap.o dgap-objs := dgap_driver.o dgap_fep5.o \ dgap_parse.o dgap_trace.o \ - dgap_tty.o dgap_sysfs.o + dgap_sysfs.o Reading git-diff-tree failed