diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2011-11-20 22:05:16 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 18:11:35 -0800 |
commit | 05c0cb4e4070385d9ab79d8d4b844904eee5f3a1 (patch) | |
tree | ab901432622f69dae6295975e680b10f3d1f08f0 | |
parent | 15eac0f8471e2be2ba8b7f80782eb758efd15233 (diff) | |
download | linux-3.10-05c0cb4e4070385d9ab79d8d4b844904eee5f3a1.tar.gz linux-3.10-05c0cb4e4070385d9ab79d8d4b844904eee5f3a1.tar.bz2 linux-3.10-05c0cb4e4070385d9ab79d8d4b844904eee5f3a1.zip |
Staging: cxt1e1: remove unnecessary includes
Remove *BSD, SunOS and userspace includes.
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/cxt1e1/comet.h | 5 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/libsbew.h | 4 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/musycc.h | 4 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmc93x6_eeprom.h | 4 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4.h | 11 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4_cpld.h | 9 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4_drv.c | 6 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/sbew_ioc.h | 7 |
8 files changed, 0 insertions, 50 deletions
diff --git a/drivers/staging/cxt1e1/comet.h b/drivers/staging/cxt1e1/comet.h index 5cb3afda011..16144437f27 100644 --- a/drivers/staging/cxt1e1/comet.h +++ b/drivers/staging/cxt1e1/comet.h @@ -38,12 +38,7 @@ *----------------------------------------------------------------------------- */ -#if defined(__FreeBSD__) || defined (__NetBSD__) -#include <sys/types.h> -#else #include <linux/types.h> -#endif - #define VINT32 volatile u_int32_t diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h index 5c99646cd10..c5a1be989a6 100644 --- a/drivers/staging/cxt1e1/libsbew.h +++ b/drivers/staging/cxt1e1/libsbew.h @@ -42,10 +42,6 @@ *----------------------------------------------------------------------------- */ -#ifndef __KERNEL__ -#include <sys/types.h> -#endif - #ifdef __cplusplus extern "C" { diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h index 68f3660f447..9e4d1688bee 100644 --- a/drivers/staging/cxt1e1/musycc.h +++ b/drivers/staging/cxt1e1/musycc.h @@ -40,11 +40,7 @@ *----------------------------------------------------------------------------- */ -#if defined (__FreeBSD__) || defined (__NetBSD__) -#include <sys/types.h> -#else #include <linux/types.h> -#endif #define VINT8 volatile u_int8_t #define VINT32 volatile u_int32_t diff --git a/drivers/staging/cxt1e1/pmc93x6_eeprom.h b/drivers/staging/cxt1e1/pmc93x6_eeprom.h index c3ada87efd2..6ede389f7ea 100644 --- a/drivers/staging/cxt1e1/pmc93x6_eeprom.h +++ b/drivers/staging/cxt1e1/pmc93x6_eeprom.h @@ -38,11 +38,7 @@ *----------------------------------------------------------------------------- */ -#if defined (__FreeBSD__) || defined (__NetBSD__) -#include <sys/types.h> -#else #include <linux/types.h> -#endif #ifdef __KERNEL__ diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h index e046b87763a..54158cc75c3 100644 --- a/drivers/staging/cxt1e1/pmcc4.h +++ b/drivers/staging/cxt1e1/pmcc4.h @@ -42,18 +42,7 @@ *----------------------------------------------------------------------------- */ - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#include <sys/types.h> -#else -#ifndef __KERNEL__ -#include <sys/types.h> -#else #include <linux/types.h> -#endif -#endif - - typedef int status_t; diff --git a/drivers/staging/cxt1e1/pmcc4_cpld.h b/drivers/staging/cxt1e1/pmcc4_cpld.h index 6d8f0337aa3..e008b9ee0a3 100644 --- a/drivers/staging/cxt1e1/pmcc4_cpld.h +++ b/drivers/staging/cxt1e1/pmcc4_cpld.h @@ -35,16 +35,7 @@ *----------------------------------------------------------------------------- */ - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#include <sys/types.h> -#else -#ifndef __KERNEL__ -#include <sys/types.h> -#else #include <linux/types.h> -#endif -#endif #ifdef __cplusplus extern "C" diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c index e1f07fabd22..3a9eab5f08d 100644 --- a/drivers/staging/cxt1e1/pmcc4_drv.c +++ b/drivers/staging/cxt1e1/pmcc4_drv.c @@ -85,11 +85,6 @@ char OSSIid_pmcc4_drvc[] = #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#if defined (__FreeBSD__) || defined (__NetBSD__) -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/errno.h> -#else #include <linux/types.h> #include "pmcc4_sysdep.h" #include <linux/errno.h> @@ -98,7 +93,6 @@ char OSSIid_pmcc4_drvc[] = #include <linux/timer.h> /* include for timer */ #include <linux/hdlc.h> #include <asm/io.h> -#endif #include "sbecom_inline_linux.h" #include "libsbew.h" diff --git a/drivers/staging/cxt1e1/sbew_ioc.h b/drivers/staging/cxt1e1/sbew_ioc.h index 14d371904d1..b66d6f25686 100644 --- a/drivers/staging/cxt1e1/sbew_ioc.h +++ b/drivers/staging/cxt1e1/sbew_ioc.h @@ -60,14 +60,7 @@ *----------------------------------------------------------------------------- */ -#ifndef __KERNEL__ -#include <sys/types.h> -#endif -#ifdef SunOS -#include <sys/ioccom.h> -#else #include <linux/ioctl.h> -#endif #ifdef __cplusplus extern "C" |