Merge git://git.infradead.org/iommu-2.6

[~andy/linux] / drivers / pnp / interface.c

diff --git a/drivers/pnp/interface.c b/drivers/pnp/interface.c
index 68b0c04987e4434c69a43d842b1bdc3c422481ad..cfaf5b73540bbc6b958ad7e5f15ea4822ab7c8d6 100644 (file)
--- a/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@ -278,9 +278,12 @@ static ssize_t pnp_show_current_resources(struct device *dmdev,
                switch (pnp_resource_type(res)) {
                case IORESOURCE_IO:
                case IORESOURCE_MEM:
-                       pnp_printf(buffer, " %#llx-%#llx\n",
+               case IORESOURCE_BUS:
+                       pnp_printf(buffer, " %#llx-%#llx%s\n",
                                   (unsigned long long) res->start,
-                                  (unsigned long long) res->end);
+                                  (unsigned long long) res->end,
+                                  res->flags & IORESOURCE_WINDOW ?
+                                       " window" : "");
                        break;
                case IORESOURCE_IRQ:
                case IORESOURCE_DMA: