diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2011-11-20 22:05:17 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 18:11:35 -0800 |
commit | 48d7c08f0f3ad902d7284b86ea7adade97d48836 (patch) | |
tree | 917a85d547d05f2c3550c52d28c1d03d71ef59dc | |
parent | 05c0cb4e4070385d9ab79d8d4b844904eee5f3a1 (diff) | |
download | op-kernel-dev-48d7c08f0f3ad902d7284b86ea7adade97d48836.zip op-kernel-dev-48d7c08f0f3ad902d7284b86ea7adade97d48836.tar.gz |
Staging: cxt1e1: remove ifdef __cplusplus
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/cxt1e1/libsbew.h | 9 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/musycc.h | 9 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4.h | 10 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/pmcc4_cpld.h | 10 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/sbe_promformat.h | 10 | ||||
-rw-r--r-- | drivers/staging/cxt1e1/sbew_ioc.h | 10 |
6 files changed, 0 insertions, 58 deletions
diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h index c5a1be9..dfc0fd3 100644 --- a/drivers/staging/cxt1e1/libsbew.h +++ b/drivers/staging/cxt1e1/libsbew.h @@ -42,11 +42,6 @@ *----------------------------------------------------------------------------- */ -#ifdef __cplusplus -extern "C" -{ -#endif - /********************************/ /** set driver logging level **/ /********************************/ @@ -570,8 +565,4 @@ struct sbecom_port_param extern int wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *); #endif -#ifdef __cplusplus -} -#endif - #endif /*** _INC_LIBSBEW_H_ ***/ diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h index 9e4d168..fc65fbf 100644 --- a/drivers/staging/cxt1e1/musycc.h +++ b/drivers/staging/cxt1e1/musycc.h @@ -45,11 +45,6 @@ #define VINT8 volatile u_int8_t #define VINT32 volatile u_int32_t -#ifdef __cplusplus -extern "C" -{ -#endif - #include "pmcc4_defs.h" @@ -444,10 +439,6 @@ extern "C" /* This must be defined on an entire channel group (Port) basis */ #define SUERM_THRESHOLD 0x1f -#ifdef __cplusplus -} -#endif - #undef VINT32 #undef VINT8 diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h index 54158cc..f223354 100644 --- a/drivers/staging/cxt1e1/pmcc4.h +++ b/drivers/staging/cxt1e1/pmcc4.h @@ -49,12 +49,6 @@ typedef int status_t; #define SBE_DRVR_FAIL 0 #define SBE_DRVR_SUCCESS 1 -#ifdef __cplusplus -extern "C" -{ -#endif - - /********************/ /* PMCC4 memory Map */ /********************/ @@ -94,10 +88,6 @@ extern "C" #define sbeE1errSMF 0x02 #define sbeE1CRC 0x01 -#ifdef __cplusplus -} -#endif - #ifdef __KERNEL__ /* diff --git a/drivers/staging/cxt1e1/pmcc4_cpld.h b/drivers/staging/cxt1e1/pmcc4_cpld.h index e008b9e..7860b6d 100644 --- a/drivers/staging/cxt1e1/pmcc4_cpld.h +++ b/drivers/staging/cxt1e1/pmcc4_cpld.h @@ -37,12 +37,6 @@ #include <linux/types.h> -#ifdef __cplusplus -extern "C" -{ -#endif - - /********************************/ /* iSPLD control chip registers */ /********************************/ @@ -108,8 +102,4 @@ extern "C" #define PMCC4_CPLD_INTR_CMT_3 0x04 #define PMCC4_CPLD_INTR_CMT_4 0x08 -#ifdef __cplusplus -} -#endif - #endif /* _INC_PMCC4_CPLD_H_ */ diff --git a/drivers/staging/cxt1e1/sbe_promformat.h b/drivers/staging/cxt1e1/sbe_promformat.h index 746f81b..35d64ce 100644 --- a/drivers/staging/cxt1e1/sbe_promformat.h +++ b/drivers/staging/cxt1e1/sbe_promformat.h @@ -85,12 +85,6 @@ * */ -#ifdef __cplusplus -extern "C" -{ -#endif - - #define STRUCT_OFFSET(type, symbol) ((long)&(((type *)0)->symbol)) /*------------------------------------------------------------------------ @@ -150,8 +144,4 @@ extern "C" FLD_TYPE2 fldType2; } PROMFORMAT; -#ifdef __cplusplus -} -#endif - #endif /*** _INC_SBE_PROMFORMAT_H_ ***/ diff --git a/drivers/staging/cxt1e1/sbew_ioc.h b/drivers/staging/cxt1e1/sbew_ioc.h index b66d6f2..4d5a4a0 100644 --- a/drivers/staging/cxt1e1/sbew_ioc.h +++ b/drivers/staging/cxt1e1/sbew_ioc.h @@ -62,11 +62,6 @@ #include <linux/ioctl.h> -#ifdef __cplusplus -extern "C" -{ -#endif - #define SBE_LOCKFILE "/tmp/.sbewan.LCK" #define SBE_IOC_COOKIE 0x19780926 @@ -121,9 +116,4 @@ extern "C" #define SBE_IOC_MAXVEC 1 - -#ifdef __cplusplus -} -#endif - #endif /*** _INC_SBEWIOC_H_ ***/ |