summaryrefslogtreecommitdiffstats
path: root/drivers/bcma
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-06-12 14:35:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-12 14:35:23 -0400
commit861bca265e7808e2493590843b8585f6943af16f (patch)
treef9c6d3beee927191856479888bc845859cd135cf /drivers/bcma
parent8b3e7be437a6b62118d0485ad971e724afe23fdf (diff)
parente0e29b683d6784ef59bbc914eac85a04b650e63c (diff)
downloadlinux-861bca265e7808e2493590843b8585f6943af16f.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts: drivers/net/wireless/ath/ath9k/Kconfig net/mac80211/iface.c
Diffstat (limited to 'drivers/bcma')
-rw-r--r--drivers/bcma/scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index bca9c80056fe..8bffa5c9818c 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -84,6 +84,8 @@ static const struct bcma_device_id_name bcma_bcm_device_names[] = {
{ BCMA_CORE_I2S, "I2S" },
{ BCMA_CORE_SDR_DDR1_MEM_CTL, "SDR/DDR1 Memory Controller" },
{ BCMA_CORE_SHIM, "SHIM" },
+ { BCMA_CORE_PCIE2, "PCIe Gen2" },
+ { BCMA_CORE_ARM_CR4, "ARM CR4" },
{ BCMA_CORE_DEFAULT, "Default" },
};