Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
  ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
  acpi: fix section mismatch warning in pnpacpi
  intel_menlo: fix build warning
  ACPI: Cleanup: Remove unneeded, multiple local dummy variables
  ACPI: video - fix permissions on some proc entries
  ACPI: video - properly handle errors when registering proc elements
  ACPI: video - do not store invalid entries in attached_array list
  ACPI: re-name acpi_pm_ops to acpi_suspend_ops
  ACER_WMI/ASUS_LAPTOP: fix build bug
  thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
  ACPI: check a return value correctly in acpi_power_get_context()
  #if 0 acpi/bay.c:eject_removable_drive()
  eeepc-laptop: add hwmon fan control
  eeepc-laptop: add backlight
  eeepc-laptop: add base driver
  ACPI: thinkpad-acpi: bump up version to 0.20
  ACPI: thinkpad-acpi: fix selects in Kconfig
  ACPI: thinkpad-acpi: use a private workqueue
  ACPI: thinkpad-acpi: fluff really minor fix
  ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
  ...

Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.

1 files changed, 63 insertions, 0 deletions

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 13c608f5fb30..3eba85ed729c 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -25,3 +25,66 @@ int pnp_is_active(struct pnp_dev *dev)
 }
 
 EXPORT_SYMBOL(pnp_is_active);
+
+/*
+ * Functionally similar to acpi_ex_eisa_id_to_string(), but that's
+ * buried in the ACPI CA, and we can't depend on it being present.
+ */
+void pnp_eisa_id_to_string(u32 id, char *str)
+{
+        id = be32_to_cpu(id);
+
+        /*
+         * According to the specs, the first three characters are five-bit
+         * compressed ASCII, and the left-over high order bit should be zero.
+         * However, the Linux ISAPNP code historically used six bits for the
+         * first character, and there seem to be IDs that depend on that,
+         * e.g., "nEC8241" in the Linux 8250_pnp serial driver and the
+         * FreeBSD sys/pc98/cbus/sio_cbus.c driver.
+         */
+        str[0] = 'A' + ((id >> 26) & 0x3f) - 1;
+        str[1] = 'A' + ((id >> 21) & 0x1f) - 1;
+        str[2] = 'A' + ((id >> 16) & 0x1f) - 1;
+        str[3] = hex_asc((id >> 12) & 0xf);
+        str[4] = hex_asc((id >>  8) & 0xf);
+        str[5] = hex_asc((id >>  4) & 0xf);
+        str[6] = hex_asc((id >>  0) & 0xf);
+        str[7] = '\0';
+}
+
+void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
+{
+#ifdef DEBUG
+        struct resource *res;
+        int i;
+
+        dev_dbg(&dev->dev, "current resources: %s\n", desc);
+
+        for (i = 0; i < PNP_MAX_IRQ; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_IRQ, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  irq %lld flags %#lx\n",
+                                (unsigned long long) res->start, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_DMA; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_DMA, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  dma %lld flags %#lx\n",
+                                (unsigned long long) res->start, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_PORT; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_IO, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  io  %#llx-%#llx flags %#lx\n",
+                                (unsigned long long) res->start,
+                                (unsigned long long) res->end, res->flags);
+        }
+        for (i = 0; i < PNP_MAX_MEM; i++) {
+                res = pnp_get_resource(dev, IORESOURCE_MEM, i);
+                if (res && !(res->flags & IORESOURCE_UNSET))
+                        dev_dbg(&dev->dev, "  mem %#llx-%#llx flags %#lx\n",
+                                (unsigned long long) res->start,
+                                (unsigned long long) res->end, res->flags);
+        }
+#endif
+}