diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-29 16:28:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-29 16:28:28 -0700 |
| commit | dd7f36ba3ce17d4fe85987d83efd5901b0935816 (patch) | |
| tree | bad385290c22f6e10c2f587af4b9df0dfeb99e8b /include/linux/bcma/bcma.h | |
| parent | ae0eef66088777cf252c6b91d3eb5ef2f30a67c5 (diff) | |
| parent | 8732baafc3f19e69df683c3f0f36c13cec746fb9 (diff) | |
| download | op-kernel-dev-dd7f36ba3ce17d4fe85987d83efd5901b0935816.zip op-kernel-dev-dd7f36ba3ce17d4fe85987d83efd5901b0935816.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John Linville says:
====================
Here is another batch of updates intended for 3.6. This includes a
number of pulls, including ones from the mac80211, iwlwifi, ath6kl, and
wl12xx trees. I also pulled from the wireless tree to avoid potential
build conflicts. There are a number of other patches applied directly,
including a number for the Broadcom drivers and the mwifiex driver.
The updates cover the usual variety of new hardware support and feature
enhancements. It's all good work, but there aren't any big headliners.
This does resolve a net-next/wireless-next merge conflict reported
by Stephen.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bcma/bcma.h')
| -rw-r--r-- | include/linux/bcma/bcma.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index 8deaf6d..12334f9 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h @@ -70,6 +70,13 @@ struct bcma_host_ops { /* Core-ID values. */ #define BCMA_CORE_OOB_ROUTER 0x367 /* Out of band */ +#define BCMA_CORE_4706_CHIPCOMMON 0x500 +#define BCMA_CORE_4706_SOC_RAM 0x50E +#define BCMA_CORE_4706_MAC_GBIT 0x52D +#define BCMA_CORE_AMEMC 0x52E /* DDR1/2 memory controller core */ +#define BCMA_CORE_ALTA 0x534 /* I2S core */ +#define BCMA_CORE_4706_MAC_GBIT_COMMON 0x5DC +#define BCMA_CORE_DDR23_PHY 0x5DD #define BCMA_CORE_INVALID 0x700 #define BCMA_CORE_CHIPCOMMON 0x800 #define BCMA_CORE_ILINE20 0x801 |
