From acb398cba3e4ed886dcf1467bbf27b7858ca3b9c Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 27 Apr 2010 14:06:05 -0700 Subject: [PATCH] --- yaml --- r: 190708 b: refs/heads/master c: a40770a9537c72b555667851845e73484b22ba17 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpi_pad.c | 2 +- trunk/drivers/pnp/resource.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8b7499b9223d..e8af6de3fbd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11439a6fd90b4861df64b4f983726e1c54977ab7 +refs/heads/master: a40770a9537c72b555667851845e73484b22ba17 diff --git a/trunk/drivers/acpi/acpi_pad.c b/trunk/drivers/acpi/acpi_pad.c index 19dacfd43163..62122134693b 100644 --- a/trunk/drivers/acpi/acpi_pad.c +++ b/trunk/drivers/acpi/acpi_pad.c @@ -31,7 +31,7 @@ #include #include -#define ACPI_PROCESSOR_AGGREGATOR_CLASS "processor_aggregator" +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 static DEFINE_MUTEX(isolated_cpus_lock); diff --git a/trunk/drivers/pnp/resource.c b/trunk/drivers/pnp/resource.c index e3446ab8b563..2e54e6a23c72 100644 --- a/trunk/drivers/pnp/resource.c +++ b/trunk/drivers/pnp/resource.c @@ -211,8 +211,6 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) if (tres->flags & IORESOURCE_IO) { if (cannot_compare(tres->flags)) continue; - if (tres->flags & IORESOURCE_WINDOW) - continue; tport = &tres->start; tend = &tres->end; if (ranged_conflict(port, end, tport, tend)) @@ -273,8 +271,6 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) if (tres->flags & IORESOURCE_MEM) { if (cannot_compare(tres->flags)) continue; - if (tres->flags & IORESOURCE_WINDOW) - continue; taddr = &tres->start; tend = &tres->end; if (ranged_conflict(addr, end, taddr, tend))