diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2008-10-15 14:06:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:36 -0400 |
commit | 65a0667b43ff746b2964b2a257ffff1a4747e19d (patch) | |
tree | 46793290adcfb663c1cd49afa1c1f0fdd5f83bae | |
parent | f4a8cd94fc43829d065aae94f6d379c6f0f1301c (diff) |
iwlwifi: protect headers from double inclusion
This patch protects iwl-csr.h and iwl-fh.h from double inclusion
by ifndef define endif idiom
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-csr.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fh.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/iwlwifi/iwl-csr.h index 662edf4f8d22..84f56a21770d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-csr.h +++ b/drivers/net/wireless/iwlwifi/iwl-csr.h | |||
@@ -60,6 +60,8 @@ | |||
60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
61 | * | 61 | * |
62 | *****************************************************************************/ | 62 | *****************************************************************************/ |
63 | #ifndef __iwl_csr_h__ | ||
64 | #define __iwl_csr_h__ | ||
63 | /*=== CSR (control and status registers) ===*/ | 65 | /*=== CSR (control and status registers) ===*/ |
64 | #define CSR_BASE (0x000) | 66 | #define CSR_BASE (0x000) |
65 | 67 | ||
@@ -286,4 +288,4 @@ | |||
286 | #define HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED (0x00000004) | 288 | #define HBUS_TARG_MBX_C_REG_BIT_CMD_BLOCKED (0x00000004) |
287 | 289 | ||
288 | 290 | ||
289 | 291 | #endif /* !__iwl_csr_h__ */ | |
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h index a72efdf6d1dd..8c48d8870218 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fh.h +++ b/drivers/net/wireless/iwlwifi/iwl-fh.h | |||
@@ -60,6 +60,8 @@ | |||
60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
61 | * | 61 | * |
62 | *****************************************************************************/ | 62 | *****************************************************************************/ |
63 | #ifndef __iwl_fh_h__ | ||
64 | #define __iwl_fh_h__ | ||
63 | 65 | ||
64 | /****************************/ | 66 | /****************************/ |
65 | /* Flow Handler Definitions */ | 67 | /* Flow Handler Definitions */ |
@@ -391,3 +393,4 @@ | |||
391 | /* TCSR: tx_config register values */ | 393 | /* TCSR: tx_config register values */ |
392 | #define FH_RSCSR_FRAME_SIZE_MSK (0x00003FFF) /* bits 0-13 */ | 394 | #define FH_RSCSR_FRAME_SIZE_MSK (0x00003FFF) /* bits 0-13 */ |
393 | 395 | ||
396 | #endif /* !__iwl_fh_h__ */ | ||