diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-20 15:19:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-20 15:19:01 -0400 |
| commit | ba7c96bec59d1c11cf9eaf6489e70e22f53da31b (patch) | |
| tree | 6d5c92ee3b4fa2d422f11d05da308a7cde614a5f /include/linux | |
| parent | 057cf65e4f715f62acccbd9125cf63eddfe69d30 (diff) | |
| parent | 6bb4880d9ef30375da4507aeabd6dc261a2c6c2b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bcma/bcma.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h index f14a98a79c9d..2e34db82a643 100644 --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h | |||
| @@ -134,7 +134,10 @@ struct bcma_host_ops { | |||
| 134 | #define BCMA_CORE_I2S 0x834 | 134 | #define BCMA_CORE_I2S 0x834 |
| 135 | #define BCMA_CORE_SDR_DDR1_MEM_CTL 0x835 /* SDR/DDR1 memory controller core */ | 135 | #define BCMA_CORE_SDR_DDR1_MEM_CTL 0x835 /* SDR/DDR1 memory controller core */ |
| 136 | #define BCMA_CORE_SHIM 0x837 /* SHIM component in ubus/6362 */ | 136 | #define BCMA_CORE_SHIM 0x837 /* SHIM component in ubus/6362 */ |
| 137 | #define BCMA_CORE_ARM_CR4 0x83e | 137 | #define BCMA_CORE_PHY_AC 0x83B |
| 138 | #define BCMA_CORE_PCIE2 0x83C /* PCI Express Gen2 */ | ||
| 139 | #define BCMA_CORE_USB30_DEV 0x83D | ||
| 140 | #define BCMA_CORE_ARM_CR4 0x83E | ||
| 138 | #define BCMA_CORE_DEFAULT 0xFFF | 141 | #define BCMA_CORE_DEFAULT 0xFFF |
| 139 | 142 | ||
| 140 | #define BCMA_MAX_NR_CORES 16 | 143 | #define BCMA_MAX_NR_CORES 16 |