Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c15e811 authored by Mark Hounschell's avatar Mark Hounschell Committed by Greg Kroah-Hartman
Browse files

staging: dgap: Merge dgap_types.h into dgap_driver.h 



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: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81d5fb3c

drivers/staging/dgap/dgap_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <linux/kdev_t.h>



#include "dgap_driver.h"

#include "dgap_types.h"



#define init_MUTEX(sem)         sema_init(sem, 1)

#define DECLARE_MUTEX(name)     \

drivers/staging/dgap/dgap_driver.h

+11 −1
Original line number Diff line number Diff line
@@ -31,9 +31,19 @@ 
#include <linux/tty.h>          /* To pick up the various tty structs/defines */

#include <linux/interrupt.h>    /* For irqreturn_t type */



#include "dgap_types.h"         /* Additional types needed by the Digi header files */

#include "digi.h"               /* Digi specific ioctl header */



#ifndef TRUE

# define TRUE 1

#endif



#ifndef FALSE

# define FALSE 0

#endif



/* Required for our shared headers! */

typedef unsigned char		uchar;



#if !defined(TTY_FLIPBUF_SIZE)

# define TTY_FLIPBUF_SIZE 512

#endif

drivers/staging/dgap/dgap_types.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * 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_TYPES_H

#define __DGAP_TYPES_H



#ifndef TRUE

# define TRUE 1

#endif



#ifndef FALSE

# define FALSE 0

#endif



/* Required for our shared headers! */

typedef unsigned char		uchar;



#endif