Skip to content

Commit

Permalink
Staging: cxt1e1: remove ifdef __cplusplus
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alexander Beregalov authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 05c0cb4 commit 48d7c08
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 58 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/cxt1e1/libsbew.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
*-----------------------------------------------------------------------------
*/

#ifdef __cplusplus
extern "C"
{
#endif

/********************************/
/** set driver logging level **/
/********************************/
Expand Down Expand Up @@ -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_ ***/
9 changes: 0 additions & 9 deletions drivers/staging/cxt1e1/musycc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down Expand Up @@ -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

Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/cxt1e1/pmcc4.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
/********************/
Expand Down Expand Up @@ -94,10 +88,6 @@ extern "C"
#define sbeE1errSMF 0x02
#define sbeE1CRC 0x01

#ifdef __cplusplus
}
#endif

#ifdef __KERNEL__

/*
Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/cxt1e1/pmcc4_cpld.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@

#include <linux/types.h>

#ifdef __cplusplus
extern "C"
{
#endif


/********************************/
/* iSPLD control chip registers */
/********************************/
Expand Down Expand Up @@ -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_ */
10 changes: 0 additions & 10 deletions drivers/staging/cxt1e1/sbe_promformat.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@
*
*/

#ifdef __cplusplus
extern "C"
{
#endif


#define STRUCT_OFFSET(type, symbol) ((long)&(((type *)0)->symbol))

/*------------------------------------------------------------------------
Expand Down Expand Up @@ -150,8 +144,4 @@ extern "C"
FLD_TYPE2 fldType2;
} PROMFORMAT;

#ifdef __cplusplus
}
#endif

#endif /*** _INC_SBE_PROMFORMAT_H_ ***/
10 changes: 0 additions & 10 deletions drivers/staging/cxt1e1/sbew_ioc.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@

#include <linux/ioctl.h>

#ifdef __cplusplus
extern "C"
{
#endif

#define SBE_LOCKFILE "/tmp/.sbewan.LCK"

#define SBE_IOC_COOKIE 0x19780926
Expand Down Expand Up @@ -121,9 +116,4 @@ extern "C"

#define SBE_IOC_MAXVEC 1


#ifdef __cplusplus
}
#endif

#endif /*** _INC_SBEWIOC_H_ ***/

0 comments on commit 48d7c08

Please sign in to comment.