staging: dgap: Merge dgap_tty.h 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/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c
index d1c539b0e501439a337f1dafb8f8d2242ec569d1..1f93066c9df37712dcf3b608369a7cdcd52f4f9a 100644 (file)
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap_driver.c
@@ -52,7 +52,6 @@
 #include "dgap_driver.h"
 #include "dgap_pci.h"
 #include "dgap_fep5.h"
-#include "dgap_tty.h"
 #include "dgap_conf.h"
 #include "dgap_parse.h"
 #include "dgap_sysfs.h"
@@ -129,6 +128,14 @@ static void dgap_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te
 static int dgap_tty_put_char(struct tty_struct *tty, unsigned char c);
 static void dgap_tty_send_xchar(struct tty_struct *tty, char ch);
 
+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);
+
 /*
  * Our function prototypes from dgap_fep5
  */

diff --git a/drivers/staging/dgap/dgap_tty.h b/drivers/staging/dgap/dgap_tty.h
deleted file mode 100644 (file)
index 464a460..0000000
--- a/drivers/staging/dgap/dgap_tty.h
+++ /dev/null
@@ -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