diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/ssb/scan.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/ssb/scan.c')
| -rw-r--r-- | drivers/ssb/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c index e8b89e8ac9bd..0d6c0280eb34 100644 --- a/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c | |||
| @@ -354,7 +354,7 @@ int ssb_bus_scan(struct ssb_bus *bus, | |||
| 354 | dev->bus = bus; | 354 | dev->bus = bus; |
| 355 | dev->ops = bus->ops; | 355 | dev->ops = bus->ops; |
| 356 | 356 | ||
| 357 | ssb_dprintk(KERN_INFO PFX | 357 | printk(KERN_DEBUG PFX |
| 358 | "Core %d found: %s " | 358 | "Core %d found: %s " |
| 359 | "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n", | 359 | "(cc 0x%03X, rev 0x%02X, vendor 0x%04X)\n", |
| 360 | i, ssb_core_name(dev->id.coreid), | 360 | i, ssb_core_name(dev->id.coreid), |