From ad610b3a3ed1e16fca3ed5da9e22853d49f6d61b Mon Sep 17 00:00:00 2001 From: matthieu castet Date: Fri, 6 Jan 2006 01:31:00 -0500 Subject: [PATCH] --- yaml --- r: 19531 b: refs/heads/master c: c4bb6f5ad968540d7f9619565bacd18d7419b85f h: refs/heads/master i: 19529: 6149001610d575d9bb983a78f557ae0d85710890 19527: a78b7ac2597b26c32869c66763976847ce5b2585 v: v3 --- [refs] | 2 +- trunk/drivers/pnp/pnpacpi/core.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68f128006199..6b4eb30c9e51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07b0120d53a3e7cbc88458a64a4d668fc416100f +refs/heads/master: c4bb6f5ad968540d7f9619565bacd18d7419b85f diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c index e77d1feb759e..f104577f73e0 100644 --- a/trunk/drivers/pnp/pnpacpi/core.c +++ b/trunk/drivers/pnp/pnpacpi/core.c @@ -27,12 +27,15 @@ static int num = 0; +/* We need only to blacklist devices that have already an acpi driver that + * can't use pnp layer. We don't need to blacklist device that are directly + * used by the kernel (PCI root, ...), as it is harmless and there were + * already present in pnpbios. But there is an exception for devices that + * have irqs (PIC, Timer) because we call acpi_register_gsi. + * Finaly only devices that have a CRS method need to be in this list. + */ static char __initdata excluded_id_list[] = - "PNP0C0A," /* Battery */ - "PNP0C0C,PNP0C0E,PNP0C0D," /* Button */ "PNP0C09," /* EC */ - "PNP0C0B," /* Fan */ - "PNP0A03," /* PCI root */ "PNP0C0F," /* Link device */ "PNP0000," /* PIC */ "PNP0100," /* Timer */