Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: cxt1e1: remove ifdef __cplusplus

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Alexander Beregalov and committed by
Greg Kroah-Hartman
48d7c08f 05c0cb4e

-58
-9
drivers/staging/cxt1e1/libsbew.h
··· 42 42 *----------------------------------------------------------------------------- 43 43 */ 44 44 45 - #ifdef __cplusplus 46 - extern "C" 47 - { 48 - #endif 49 - 50 45 /********************************/ 51 46 /** set driver logging level **/ 52 47 /********************************/ ··· 563 568 #ifdef NOT_YET_COMMON 564 569 extern int wancfg_get_tsioc (wcfg_t *, struct wanc1t3_ts_hdr *, struct wanc1t3_ts_param *); 565 570 extern int wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *); 566 - #endif 567 - 568 - #ifdef __cplusplus 569 - } 570 571 #endif 571 572 572 573 #endif /*** _INC_LIBSBEW_H_ ***/
-9
drivers/staging/cxt1e1/musycc.h
··· 45 45 #define VINT8 volatile u_int8_t 46 46 #define VINT32 volatile u_int32_t 47 47 48 - #ifdef __cplusplus 49 - extern "C" 50 - { 51 - #endif 52 - 53 48 #include "pmcc4_defs.h" 54 49 55 50 ··· 438 443 439 444 /* This must be defined on an entire channel group (Port) basis */ 440 445 #define SUERM_THRESHOLD 0x1f 441 - 442 - #ifdef __cplusplus 443 - } 444 - #endif 445 446 446 447 #undef VINT32 447 448 #undef VINT8
-10
drivers/staging/cxt1e1/pmcc4.h
··· 49 49 #define SBE_DRVR_FAIL 0 50 50 #define SBE_DRVR_SUCCESS 1 51 51 52 - #ifdef __cplusplus 53 - extern "C" 54 - { 55 - #endif 56 - 57 - 58 52 /********************/ 59 53 /* PMCC4 memory Map */ 60 54 /********************/ ··· 87 93 88 94 #define sbeE1errSMF 0x02 89 95 #define sbeE1CRC 0x01 90 - 91 - #ifdef __cplusplus 92 - } 93 - #endif 94 96 95 97 #ifdef __KERNEL__ 96 98
-10
drivers/staging/cxt1e1/pmcc4_cpld.h
··· 37 37 38 38 #include <linux/types.h> 39 39 40 - #ifdef __cplusplus 41 - extern "C" 42 - { 43 - #endif 44 - 45 - 46 40 /********************************/ 47 41 /* iSPLD control chip registers */ 48 42 /********************************/ ··· 101 107 #define PMCC4_CPLD_INTR_CMT_2 0x02 102 108 #define PMCC4_CPLD_INTR_CMT_3 0x04 103 109 #define PMCC4_CPLD_INTR_CMT_4 0x08 104 - 105 - #ifdef __cplusplus 106 - } 107 - #endif 108 110 109 111 #endif /* _INC_PMCC4_CPLD_H_ */
-10
drivers/staging/cxt1e1/sbe_promformat.h
··· 85 85 * 86 86 */ 87 87 88 - #ifdef __cplusplus 89 - extern "C" 90 - { 91 - #endif 92 - 93 - 94 88 #define STRUCT_OFFSET(type, symbol) ((long)&(((type *)0)->symbol)) 95 89 96 90 /*------------------------------------------------------------------------ ··· 143 149 FLD_TYPE1 fldType1; 144 150 FLD_TYPE2 fldType2; 145 151 } PROMFORMAT; 146 - 147 - #ifdef __cplusplus 148 - } 149 - #endif 150 152 151 153 #endif /*** _INC_SBE_PROMFORMAT_H_ ***/
-10
drivers/staging/cxt1e1/sbew_ioc.h
··· 62 62 63 63 #include <linux/ioctl.h> 64 64 65 - #ifdef __cplusplus 66 - extern "C" 67 - { 68 - #endif 69 - 70 65 #define SBE_LOCKFILE "/tmp/.sbewan.LCK" 71 66 72 67 #define SBE_IOC_COOKIE 0x19780926 ··· 115 120 */ 116 121 117 122 #define SBE_IOC_MAXVEC 1 118 - 119 - 120 - #ifdef __cplusplus 121 - } 122 - #endif 123 123 124 124 #endif /*** _INC_SBEWIOC_H_ ***/