diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 14:18:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 14:18:27 -0700 |
| commit | 5142ef1cbda9a48ff87e9b944096767252204c6e (patch) | |
| tree | f3227002f3cc0169566f5c34291b86f876bb676c /arch/m68k/kernel/pcibios.c | |
| parent | 6a16dda86ebbcfe690c753c3fb469b4f9ad5a5ef (diff) | |
| parent | b24f670b7f5b2058b95370caa9f104b3cefb9f1d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization
m68k/pci: Remove a superflous KERN_ERR
m68k/defconfig: Update defconfigs for v4.0-rc1
m68k/q40: Make NE2000 builtin instead of modular
m68k: Remove FSF address
Diffstat (limited to 'arch/m68k/kernel/pcibios.c')
| -rw-r--r-- | arch/m68k/kernel/pcibios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/pcibios.c b/arch/m68k/kernel/pcibios.c index 931a31ff59dd..8520250a1d93 100644 --- a/arch/m68k/kernel/pcibios.c +++ b/arch/m68k/kernel/pcibios.c @@ -62,7 +62,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) r = dev->resource + idx; if (!r->start && r->end) { - pr_err(KERN_ERR "PCI: Device %s not available because of resource collisions\n", + pr_err("PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } |