From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 2 Jun 2008 22:42:49 +0000 (-0600)
Subject: PNP: mark resources that conflict with PCI devices "disabled"
X-Git-Tag: v2.6.26-rc5~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b34fe156455d26ee6ed67b61539f136bf4e439c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed