diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /drivers/net/wireless/iwlwifi/iwl-5000-hw.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000-hw.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h index 17d4f31c5934..c479ee211c5c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-5000-hw.h | |||
| @@ -129,6 +129,13 @@ struct iwl5000_shared { | |||
| 129 | __le32 padding2; | 129 | __le32 padding2; |
| 130 | } __attribute__ ((packed)); | 130 | } __attribute__ ((packed)); |
| 131 | 131 | ||
| 132 | /* calibrations defined for 5000 */ | ||
| 133 | /* defines the order in which results should be sent to the runtime uCode */ | ||
| 134 | enum iwl5000_calib { | ||
| 135 | IWL5000_CALIB_LO, | ||
| 136 | IWL5000_CALIB_TX_IQ, | ||
| 137 | IWL5000_CALIB_TX_IQ_PERD, | ||
| 138 | }; | ||
| 132 | 139 | ||
| 133 | #endif /* __iwl_5000_hw_h__ */ | 140 | #endif /* __iwl_5000_hw_h__ */ |
| 134 | 141 | ||