Commit 48d7c08f authored by Alexander Beregalov's avatar Alexander Beregalov Committed by Greg Kroah-Hartman

Staging: cxt1e1: remove ifdef __cplusplus

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 05c0cb4e
...@@ -42,11 +42,6 @@ ...@@ -42,11 +42,6 @@
*----------------------------------------------------------------------------- *-----------------------------------------------------------------------------
*/ */
#ifdef __cplusplus
extern "C"
{
#endif
/********************************/ /********************************/
/** set driver logging level **/ /** set driver logging level **/
/********************************/ /********************************/
...@@ -570,8 +565,4 @@ struct sbecom_port_param ...@@ -570,8 +565,4 @@ struct sbecom_port_param
extern int wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *); extern int wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *);
#endif #endif
#ifdef __cplusplus
}
#endif
#endif /*** _INC_LIBSBEW_H_ ***/ #endif /*** _INC_LIBSBEW_H_ ***/
...@@ -45,11 +45,6 @@ ...@@ -45,11 +45,6 @@
#define VINT8 volatile u_int8_t #define VINT8 volatile u_int8_t
#define VINT32 volatile u_int32_t #define VINT32 volatile u_int32_t
#ifdef __cplusplus
extern "C"
{
#endif
#include "pmcc4_defs.h" #include "pmcc4_defs.h"
...@@ -444,10 +439,6 @@ extern "C" ...@@ -444,10 +439,6 @@ extern "C"
/* This must be defined on an entire channel group (Port) basis */ /* This must be defined on an entire channel group (Port) basis */
#define SUERM_THRESHOLD 0x1f #define SUERM_THRESHOLD 0x1f
#ifdef __cplusplus
}
#endif
#undef VINT32 #undef VINT32
#undef VINT8 #undef VINT8
......
...@@ -49,12 +49,6 @@ typedef int status_t; ...@@ -49,12 +49,6 @@ typedef int status_t;
#define SBE_DRVR_FAIL 0 #define SBE_DRVR_FAIL 0
#define SBE_DRVR_SUCCESS 1 #define SBE_DRVR_SUCCESS 1
#ifdef __cplusplus
extern "C"
{
#endif
/********************/ /********************/
/* PMCC4 memory Map */ /* PMCC4 memory Map */
/********************/ /********************/
...@@ -94,10 +88,6 @@ extern "C" ...@@ -94,10 +88,6 @@ extern "C"
#define sbeE1errSMF 0x02 #define sbeE1errSMF 0x02
#define sbeE1CRC 0x01 #define sbeE1CRC 0x01
#ifdef __cplusplus
}
#endif
#ifdef __KERNEL__ #ifdef __KERNEL__
/* /*
......
...@@ -37,12 +37,6 @@ ...@@ -37,12 +37,6 @@
#include <linux/types.h> #include <linux/types.h>
#ifdef __cplusplus
extern "C"
{
#endif
/********************************/ /********************************/
/* iSPLD control chip registers */ /* iSPLD control chip registers */
/********************************/ /********************************/
...@@ -108,8 +102,4 @@ extern "C" ...@@ -108,8 +102,4 @@ extern "C"
#define PMCC4_CPLD_INTR_CMT_3 0x04 #define PMCC4_CPLD_INTR_CMT_3 0x04
#define PMCC4_CPLD_INTR_CMT_4 0x08 #define PMCC4_CPLD_INTR_CMT_4 0x08
#ifdef __cplusplus
}
#endif
#endif /* _INC_PMCC4_CPLD_H_ */ #endif /* _INC_PMCC4_CPLD_H_ */
...@@ -85,12 +85,6 @@ ...@@ -85,12 +85,6 @@
* *
*/ */
#ifdef __cplusplus
extern "C"
{
#endif
#define STRUCT_OFFSET(type, symbol) ((long)&(((type *)0)->symbol)) #define STRUCT_OFFSET(type, symbol) ((long)&(((type *)0)->symbol))
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
...@@ -150,8 +144,4 @@ extern "C" ...@@ -150,8 +144,4 @@ extern "C"
FLD_TYPE2 fldType2; FLD_TYPE2 fldType2;
} PROMFORMAT; } PROMFORMAT;
#ifdef __cplusplus
}
#endif
#endif /*** _INC_SBE_PROMFORMAT_H_ ***/ #endif /*** _INC_SBE_PROMFORMAT_H_ ***/
...@@ -62,11 +62,6 @@ ...@@ -62,11 +62,6 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#ifdef __cplusplus
extern "C"
{
#endif
#define SBE_LOCKFILE "/tmp/.sbewan.LCK" #define SBE_LOCKFILE "/tmp/.sbewan.LCK"
#define SBE_IOC_COOKIE 0x19780926 #define SBE_IOC_COOKIE 0x19780926
...@@ -121,9 +116,4 @@ extern "C" ...@@ -121,9 +116,4 @@ extern "C"
#define SBE_IOC_MAXVEC 1 #define SBE_IOC_MAXVEC 1
#ifdef __cplusplus
}
#endif
#endif /*** _INC_SBEWIOC_H_ ***/ #endif /*** _INC_SBEWIOC_H_ ***/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment