diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
| commit | a9802d43f205faa2fff422502a1336a50b9615c3 (patch) | |
| tree | 57152d6c84556320570802d01bbe04cefd8a2a7d /drivers/ssb/scan.c | |
| parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index 3e844874631f..266c7c5c86dc 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c | |||
| @@ -318,6 +318,9 @@ int ssb_bus_scan(struct ssb_bus *bus, | |||
| 318 | bus->chip_package = 0; | 318 | bus->chip_package = 0; |
| 319 | } | 319 | } |
| 320 | } | 320 | } |
| 321 | ssb_printk(KERN_INFO PFX "Found chip with id 0x%04X, rev 0x%02X and " | ||
| 322 | "package 0x%02X\n", bus->chip_id, bus->chip_rev, | ||
| 323 | bus->chip_package); | ||
| 321 | if (!bus->nr_devices) | 324 | if (!bus->nr_devices) |
| 322 | bus->nr_devices = chipid_to_nrcores(bus->chip_id); | 325 | bus->nr_devices = chipid_to_nrcores(bus->chip_id); |
| 323 | if (bus->nr_devices > ARRAY_SIZE(bus->devices)) { | 326 | if (bus->nr_devices > ARRAY_SIZE(bus->devices)) { |