Remove dgap_kcompat.h and_dgap_types.h. These files are only required for older 2.x.x kernels. Signed-off-by: Mark Hounschell <markh@xxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> drivers/staging/dgap/dgap_driver.c | 2 drivers/staging/dgap/dgap_driver.h | 22 ++++++++ drivers/staging/dgap/dgap_kcompat.h | 64 -------------------------- drivers/staging/dgap/dgap_types.h | 36 -------------- 4 files changed, 20 insertions(+), 104 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 09:55:35.298027046 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c 2014-02-11 10:07:00.122346031 -0500 @@ -69,8 +69,6 @@ #include <linux/kdev_t.h> #include "dgap_driver.h" -#include "dgap_types.h" - /* * Function prototypes. 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 09:34:25.247042563 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.h 2014-02-11 10:17:49.137517346 -0500 @@ -32,8 +32,15 @@ #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 "dgap_kcompat.h" /* Kernel 2.4/2.6 compat includes */ +#if !defined(TTY_FLIPBUF_SIZE) +# define TTY_FLIPBUF_SIZE 512 +#endif + +#define PARM_INT(VAR, INIT, PERM, DESC) \ + static int VAR = INIT; \ + int dgap_##VAR; \ + module_param(VAR, int, PERM); \ + MODULE_PARM_DESC(VAR, DESC); /************************************************************************* * @@ -64,6 +71,17 @@ #define TRC_TO_CONSOLE 1 +#ifndef TRUE +# define TRUE 1 +#endif + +#ifndef FALSE +# define FALSE 0 +#endif + +/* Required for our shared headers! */ +typedef unsigned char uchar; + /************************************************************************ * Stuff from dgap_pci.h ************************************************************************/ diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_kcompat.h linux-3.13.1-new/drivers/staging/dgap/dgap_kcompat.h --- linux-3.13.1-orig/drivers/staging/dgap/dgap_kcompat.h 2014-01-29 08:06:37.000000000 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_kcompat.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,64 +0,0 @@ -/* - * Copyright 2004 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!!! - * - ************************************************************************* - * - * This file is intended to contain all the kernel "differences" between the - * various kernels that we support. - * - *************************************************************************/ - -#ifndef __DGAP_KCOMPAT_H -#define __DGAP_KCOMPAT_H - -#if !defined(TTY_FLIPBUF_SIZE) -# define TTY_FLIPBUF_SIZE 512 -#endif - - -/* Sparse stuff */ -# ifndef __user -# define __user -# define __kernel -# define __safe -# define __force -# define __chk_user_ptr(x) (void)0 -# endif - - -# define PARM_STR(VAR, INIT, PERM, DESC) \ - static char *VAR = INIT; \ - char *dgap_##VAR; \ - module_param(VAR, charp, PERM); \ - MODULE_PARM_DESC(VAR, DESC); - -# define PARM_INT(VAR, INIT, PERM, DESC) \ - static int VAR = INIT; \ - int dgap_##VAR; \ - module_param(VAR, int, PERM); \ - MODULE_PARM_DESC(VAR, DESC); - -# define PARM_ULONG(VAR, INIT, PERM, DESC) \ - static ulong VAR = INIT; \ - ulong dgap_##VAR; \ - module_param(VAR, long, PERM); \ - MODULE_PARM_DESC(VAR, DESC); - -#endif /* ! __DGAP_KCOMPAT_H */ diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_types.h linux-3.13.1-new/drivers/staging/dgap/dgap_types.h --- linux-3.13.1-orig/drivers/staging/dgap/dgap_types.h 2014-01-29 08:06:37.000000000 -0500 +++ linux-3.13.1-new/drivers/staging/dgap/dgap_types.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,36 +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_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 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
