diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/country.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/country.h')
-rw-r--r-- | drivers/staging/vt6655/country.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/vt6655/country.h b/drivers/staging/vt6655/country.h index 65d1e52..2005d27 100644 --- a/drivers/staging/vt6655/country.h +++ b/drivers/staging/vt6655/country.h @@ -30,10 +30,7 @@ #ifndef __COUNTRY_H__ #define __COUNTRY_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - /*--------------------- Export Definitions -------------------------*/ /************************************************************************ @@ -168,7 +165,7 @@ typedef struct tagSCountryTable CHAR chCountryCode[2]; BYTE bChannelIdxList[CB_MAX_CHANNEL]; /* Available channels Index */ BYTE byPower[CB_MAX_CHANNEL]; -} SCountryTable, DEF* PSCountryTable; +} SCountryTable, *PSCountryTable; /*--------------------- Export Classes ----------------------------*/ @@ -176,17 +173,5 @@ typedef struct tagSCountryTable extern SCountryTable ChannelRuleTab[CCODE_MAX+1]; /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - -/************************************************************************ - * Function prototype - ************************************************************************/ #endif /* __COUNTRY_H__ */ |