diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-06-03 00:42:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-03 00:59:06 +0200 |
| commit | 4b34fe156455d26ee6ed67b61539f136bf4e439c (patch) | |
| tree | 901d16b111b1cbb2b7eaed549e54b548643e8a45 /drivers/serial | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| download | linux-4b34fe156455d26ee6ed67b61539f136bf4e439c.tar.xz linux-4b34fe156455d26ee6ed67b61539f136bf4e439c.zip | |
PNP: mark resources that conflict with PCI devices "disabled"
Both the PNP/PCI conflict detection quirk and the PNP system
driver must use the same mechanism to mark resources as disabled.
I think it's best to keep the resource and to keep the type bit
(IORESOURCE_MEM, etc), so that we match the list from firmware
as closely as possible.
Fixes this regression from 2.6.25: http://lkml.org/lkml/2008/6/1/82
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Tested-by: Avuton Olrich <avuton@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial')
0 files changed, 0 insertions, 0 deletions