diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/ssb | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/pcmcia.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index d288608d2206..100e7a5c5ea1 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c | |||
| @@ -583,7 +583,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom) | |||
| 583 | ssb_printk("."); | 583 | ssb_printk("."); |
| 584 | err = ssb_pcmcia_sprom_write(bus, i, sprom[i]); | 584 | err = ssb_pcmcia_sprom_write(bus, i, sprom[i]); |
| 585 | if (err) { | 585 | if (err) { |
| 586 | ssb_printk("\n" KERN_NOTICE PFX | 586 | ssb_printk(KERN_NOTICE PFX |
| 587 | "Failed to write to SPROM.\n"); | 587 | "Failed to write to SPROM.\n"); |
| 588 | failed = 1; | 588 | failed = 1; |
| 589 | break; | 589 | break; |
| @@ -591,7 +591,7 @@ static int ssb_pcmcia_sprom_write_all(struct ssb_bus *bus, const u16 *sprom) | |||
| 591 | } | 591 | } |
| 592 | err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS); | 592 | err = ssb_pcmcia_sprom_command(bus, SSB_PCMCIA_SPROMCTL_WRITEDIS); |
| 593 | if (err) { | 593 | if (err) { |
| 594 | ssb_printk("\n" KERN_NOTICE PFX | 594 | ssb_printk(KERN_NOTICE PFX |
| 595 | "Could not disable SPROM write access.\n"); | 595 | "Could not disable SPROM write access.\n"); |
| 596 | failed = 1; | 596 | failed = 1; |
| 597 | } | 597 | } |