diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/ssb/pci.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 a467b20baac..6f34963b3c6 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 |