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: (123 commits)
  dock: make dock driver not a module
  ACPI: fix ia64 build warning
  ACPI: hack around sysfs warning with link order
  ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
  intel_menlo: fix build warning
  panasonic-laptop: fix build
  ACPICA: Update version to 20080926
  ACPICA: Add support for zero-length buffer-to-string conversions
  ACPICA: New: Validation for predefined ACPI methods/objects
  ACPICA: Fix for implicit return compatibility
  ACPICA: Fixed a couple memory leaks associated with "implicit return"
  ACPICA: Optimize buffer allocation procedure
  ACPICA: Fix possible memory leak, error exit path
  ACPICA: Fix fault after mem allocation failure in AML parser
  ACPICA: Remove unused ACPI register bit definition
  ACPICA: Update version to 20080829
  ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
  ACPICA: Cleanup for internal Reference Object
  ACPICA: Update comments - no functional changes
  ACPICA: Update for Reference ACPI_OPERAND_OBJECT
  ...

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index b42df162071..63087d5ce60 100644
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -75,18 +75,17 @@ char *pnp_resource_type_name(struct resource *res)
 
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
 {
-#ifdef DEBUG
         char buf[128];
         int len;
         struct pnp_resource *pnp_res;
         struct resource *res;
 
         if (list_empty(&dev->resources)) {
-                dev_dbg(&dev->dev, "%s: no current resources\n", desc);
+                pnp_dbg(&dev->dev, "%s: no current resources\n", desc);
                 return;
         }
 
-        dev_dbg(&dev->dev, "%s: current resources:\n", desc);
+        pnp_dbg(&dev->dev, "%s: current resources:\n", desc);
         list_for_each_entry(pnp_res, &dev->resources, list) {
                 res = &pnp_res->res;
                 len = 0;
@@ -95,7 +94,7 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
                                  pnp_resource_type_name(res));
 
                 if (res->flags & IORESOURCE_DISABLED) {
-                        dev_dbg(&dev->dev, "%sdisabled\n", buf);
+                        pnp_dbg(&dev->dev, "%sdisabled\n", buf);
                         continue;
                 }
 
@@ -116,9 +115,8 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
                                          res->flags);
                         break;
                 }
-                dev_dbg(&dev->dev, "%s\n", buf);
+                pnp_dbg(&dev->dev, "%s\n", buf);
         }
-#endif
 }
 
 char *pnp_option_priority_name(struct pnp_option *option)
@@ -136,7 +134,6 @@ char *pnp_option_priority_name(struct pnp_option *option)
 
 void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)
 {
-#ifdef DEBUG
         char buf[128];
         int len = 0, i;
         struct pnp_port *port;
@@ -208,6 +205,5 @@ void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)
                                  "flags %#x", dma->map, dma->flags);
                 break;
         }
-        dev_dbg(&dev->dev, "%s\n", buf);
-#endif
+        pnp_dbg(&dev->dev, "%s\n", buf);
 }