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, 10 insertions, 11 deletions

diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 55c4563986b3..9c2496dbeee4 100644
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -56,14 +56,15 @@ static void reserve_range(struct pnp_dev *dev, resource_size_t start,
 
 static void reserve_resources_of_dev(struct pnp_dev *dev)
 {
+        struct resource *res;
         int i;
 
-        for (i = 0; i < PNP_MAX_PORT; i++) {
-                if (!pnp_port_valid(dev, i))
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_IO, i)); i++) {
+                if (res->flags & IORESOURCE_UNSET)
                         continue;
-                if (pnp_port_start(dev, i) == 0)
+                if (res->start == 0)
                         continue;       /* disabled */
-                if (pnp_port_start(dev, i) < 0x100)
+                if (res->start < 0x100)
                         /*
                          * Below 0x100 is only standard PC hardware
                          * (pics, kbd, timer, dma, ...)
@@ -73,19 +74,17 @@ static void reserve_resources_of_dev(struct pnp_dev *dev)
                          * So, do nothing
                          */
                         continue;
-                if (pnp_port_end(dev, i) < pnp_port_start(dev, i))
+                if (res->end < res->start)
                         continue;       /* invalid */
 
-                reserve_range(dev, pnp_port_start(dev, i),
-                              pnp_port_end(dev, i), 1);
+                reserve_range(dev, res->start, res->end, 1);
         }
 
-        for (i = 0; i < PNP_MAX_MEM; i++) {
-                if (!pnp_mem_valid(dev, i))
+        for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) {
+                if (res->flags & IORESOURCE_UNSET)
                         continue;
 
-                reserve_range(dev, pnp_mem_start(dev, i),
-                              pnp_mem_end(dev, i), 0);
+                reserve_range(dev, res->start, res->end, 0);
         }
 }