diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 22:14:16 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 22:14:16 +0200 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /drivers/ssb/main.c | |
| parent | forcedeth: Kill NAPI config options. (diff) | |
| parent | mac80211: use fixed channel in ibss join when appropriate (diff) | |
| download | linux-83163244f845c296a118ce85c653872dbff6abfe.tar.xz linux-83163244f845c296a118ce85c653872dbff6abfe.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'drivers/ssb/main.c')
| -rw-r--r-- | drivers/ssb/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 80ff7d9e60de..7e5b8a8a64cc 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -834,6 +834,9 @@ int ssb_bus_pcibus_register(struct ssb_bus *bus, if (!err) { ssb_printk(KERN_INFO PFX "Sonics Silicon Backplane found on " "PCI device %s\n", dev_name(&host_pci->dev)); + } else { + ssb_printk(KERN_ERR PFX "Failed to register PCI version" + " of SSB with error %d\n", err); } return err; |