diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 07:45:58 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 07:45:58 -0400 |
| commit | b1fbd46976d047a6d6767872a9112afaa914fd82 (patch) | |
| tree | 59b471d8b38ca2a271fcde02f8f049e390ef485b /drivers/net/wireless/brcm80211/include | |
| parent | bf0c111ec80355ee9fe2e2bdb609a536b54768d8 (diff) | |
| parent | bf52592fe4901f486a5266fd73e4ee80205b18b4 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/include')
| -rw-r--r-- | drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h index 333193f20e1..bcc79b4e326 100644 --- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h | |||
| @@ -37,5 +37,6 @@ | |||
| 37 | #define BCM4329_CHIP_ID 0x4329 | 37 | #define BCM4329_CHIP_ID 0x4329 |
| 38 | #define BCM4330_CHIP_ID 0x4330 | 38 | #define BCM4330_CHIP_ID 0x4330 |
| 39 | #define BCM4331_CHIP_ID 0x4331 | 39 | #define BCM4331_CHIP_ID 0x4331 |
| 40 | #define BCM4334_CHIP_ID 0x4334 | ||
| 40 | 41 | ||
| 41 | #endif /* _BRCM_HW_IDS_H_ */ | 42 | #endif /* _BRCM_HW_IDS_H_ */ |