[PATCH RFC 12/17 v2] staging: dgap: Merge dgap_tty.h into dgap_driver.h

[Mark Hounschell]

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. 

Merge dgap_tty.h into dgap_driver.h

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

 drivers/staging/dgap/dgap_driver.c |    1 
 drivers/staging/dgap/dgap_driver.h |   13 +++++++++
 drivers/staging/dgap/dgap_tty.h    |   39 ---------------------------
 3 files changed, 13 insertions(+), 40 deletions(-)

diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c	2014-02-11 08:47:53.097813955 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c	2014-02-11 09:03:36.616023262 -0500
@@ -66,7 +66,6 @@
 
 
 #include "dgap_driver.h"
-#include "dgap_tty.h"
 #include "dgap_trace.h"
 #include "dgap_sysfs.h"
 
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.h linux-3.13.1-new/drivers/staging/dgap/dgap_driver.h
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.h	2014-02-11 07:57:51.427456456 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.h	2014-02-11 08:56:53.758605000 -0500
@@ -1040,6 +1040,19 @@ extern void	dgap_parity_scan(struct chan
 extern uint	dgap_get_custom_baud(struct channel_t *ch);
 extern void	dgap_firmware_reset_port(struct channel_t *ch);
 
+/*
+ * Functions prototypes from dgap_tty.h
+ */
+int	dgap_tty_register(struct board_t *brd);
+
+int	dgap_tty_preinit(void);
+int     dgap_tty_init(struct board_t *);
+
+void	dgap_tty_post_uninit(void);
+void	dgap_tty_uninit(struct board_t *);
+
+void	dgap_carrier(struct channel_t *ch);
+void	dgap_input(struct channel_t *ch);
 
 /************************************************************************* 
  ***	FEP Version 5 dependent definitions
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_tty.h linux-3.13.1-new/drivers/staging/dgap/dgap_tty.h
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_tty.h	2014-01-29 08:06:37.000000000 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_tty.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-/*
- * Copyright 2003 Digi International (www.digi.com)
- *	Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *	NOTE: THIS IS A SHARED HEADER. DO NOT CHANGE CODING STYLE!!!
- */
-
-#ifndef __DGAP_TTY_H
-#define __DGAP_TTY_H
-
-#include "dgap_driver.h"
-
-int	dgap_tty_register(struct board_t *brd);
-
-int	dgap_tty_preinit(void);
-int     dgap_tty_init(struct board_t *);
-
-void	dgap_tty_post_uninit(void);
-void	dgap_tty_uninit(struct board_t *);
-
-void	dgap_carrier(struct channel_t *ch);
-void	dgap_input(struct channel_t *ch);
-
-
-#endif