diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:35:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-27 15:35:28 -0700 |
| commit | fe31eb679752369240fc8880858a5ed974554eb2 (patch) | |
| tree | b53fcdb696b6d2048d5a38960aee64f990e2997a /arch/x86_64 | |
| parent | [PATCH] silence 'make xmldocs' warning by adding missing description of 'raw' in nand_base.c:1485 (diff) | |
| parent | PCI: Remove quirk_via_abnormal_poweroff (diff) | |
| download | linux-dev-fe31eb679752369240fc8880858a5ed974554eb2.tar.xz linux-dev-fe31eb679752369240fc8880858a5ed974554eb2.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Remove quirk_via_abnormal_poweroff
PCI: reset pci device state to unknown state for resume
PCI: x86-64: mmconfig missing printk levels
PCI: fix pci_fixup_video as it blows up on sparc64
acpiphp: fix latch status
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/pci/mmconfig.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c index 7732f4254d21..e61093b34c26 100644 --- a/arch/x86_64/pci/mmconfig.c +++ b/arch/x86_64/pci/mmconfig.c @@ -220,7 +220,7 @@ void __init pci_mmcfg_init(int type) pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL); if (pci_mmcfg_virt == NULL) { - printk("PCI: Can not allocate memory for mmconfig structures\n"); + printk(KERN_ERR "PCI: Can not allocate memory for mmconfig structures\n"); return; } for (i = 0; i < pci_mmcfg_config_num; ++i) { @@ -228,7 +228,8 @@ void __init pci_mmcfg_init(int type) pci_mmcfg_virt[i].virt = ioremap_nocache(pci_mmcfg_config[i].base_address, MMCONFIG_APER_MAX); if (!pci_mmcfg_virt[i].virt) { - printk("PCI: Cannot map mmconfig aperture for segment %d\n", + printk(KERN_ERR "PCI: Cannot map mmconfig aperture for " + "segment %d\n", pci_mmcfg_config[i].pci_segment_group_number); return; } |