diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 17:15:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 17:15:44 -0400 |
| commit | eda054770e5cd0e9ee1568dfcbcf39f9ade4f545 (patch) | |
| tree | 60d29e2a3b095e9d14657cc6e02daba0a1b5f63d /arch/mn10300 | |
| parent | 891a9894ee2e17646b29117635d2c7adfb58ce60 (diff) | |
| parent | 837c4ef13c44296bb763a0ca0e84a076592474cf (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: clear bridge resource range if BIOS assigned bad one
PCI: hotplug/cpqphp, fix NULL dereference
Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"
PCI: change resource collision messages from KERN_ERR to KERN_INFO
Diffstat (limited to 'arch/mn10300')
| -rw-r--r-- | arch/mn10300/unit-asb2305/pci-asb2305.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c index d6119b879a98..45b40ac6c464 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.c +++ b/arch/mn10300/unit-asb2305/pci-asb2305.c | |||
| @@ -117,6 +117,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
| 117 | * Invalidate the resource to prevent | 117 | * Invalidate the resource to prevent |
| 118 | * child resource allocations in this | 118 | * child resource allocations in this |
| 119 | * range. */ | 119 | * range. */ |
| 120 | r->start = r->end = 0; | ||
| 120 | r->flags = 0; | 121 | r->flags = 0; |
| 121 | } | 122 | } |
| 122 | } | 123 | } |