]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
PNP: mark resources that conflict with PCI devices "disabled"
authorBjorn Helgaas <bjorn.helgaas@hp.com>
Mon, 2 Jun 2008 22:42:49 +0000 (16:42 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Jun 2008 22:59:06 +0000 (15:59 -0700)
commit4b34fe156455d26ee6ed67b61539f136bf4e439c
tree901d16b111b1cbb2b7eaed549e54b548643e8a45
parentc3b25b32e8bef526cca748e1ba023c6bdd705a99
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>
drivers/pnp/quirks.c
drivers/pnp/system.c