diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/ssb/pci.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/ssb/pci.c')
| -rw-r--r-- | drivers/ssb/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index a467b20baac8..6f34963b3c64 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c | |||
| @@ -670,7 +670,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus, | |||
| 670 | ssb_printk(KERN_ERR PFX "No SPROM available!\n"); | 670 | ssb_printk(KERN_ERR PFX "No SPROM available!\n"); |
| 671 | return -ENODEV; | 671 | return -ENODEV; |
| 672 | } | 672 | } |
| 673 | if (bus->chipco.dev) { /* can be unavailible! */ | 673 | if (bus->chipco.dev) { /* can be unavailable! */ |
| 674 | /* | 674 | /* |
| 675 | * get SPROM offset: SSB_SPROM_BASE1 except for | 675 | * get SPROM offset: SSB_SPROM_BASE1 except for |
| 676 | * chipcommon rev >= 31 or chip ID is 0x4312 and | 676 | * chipcommon rev >= 31 or chip ID is 0x4312 and |