diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:42:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 02:42:53 +0100 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /arch/x86/pci/i386.c | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | kernel_samsung_tuna-506c10f26c481b7f8ef27c1c79290f68989b2e9e.zip kernel_samsung_tuna-506c10f26c481b7f8ef27c1c79290f68989b2e9e.tar.gz kernel_samsung_tuna-506c10f26c481b7f8ef27c1c79290f68989b2e9e.tar.bz2 | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'arch/x86/pci/i386.c')
| -rw-r--r-- | arch/x86/pci/i386.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 844df0c..f884740 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -34,8 +34,8 @@ #include <asm/pat.h> #include <asm/e820.h> +#include <asm/pci_x86.h> -#include "pci.h" static int skip_isa_ioresource_align(struct pci_dev *dev) { @@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) pr = pci_find_parent_resource(dev, r); if (!r->start || !pr || request_resource(pr, r) < 0) { - dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); + dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx); /* * Something is wrong with the region. * Invalidate the resource to prevent @@ -170,7 +170,7 @@ static void __init pcibios_allocate_resources(int pass) r->flags, disabled, pass); pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) { - dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); + dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx); /* We'll assign a new address later */ r->end -= r->start; r->start = 0; |