4 files changed, 4 insertions, 5 deletions

diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h
index 3532984a9cab..3b8b9d3cb03d 100644
--- a/drivers/pnp/base.h
+++ b/drivers/pnp/base.h
@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res);
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc);
 
 void pnp_free_resources(struct pnp_dev *dev);
-int pnp_resource_type(struct resource *res);
+unsigned long pnp_resource_type(struct resource *res);
 
 struct pnp_resource {
         struct list_head list;
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 7d65da821229..817fe626e15b 100644
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -210,7 +210,6 @@ void __pnp_remove_device(struct pnp_dev *dev)
 
 static int __init pnp_init(void)
 {
-        printk(KERN_INFO "Linux Plug and Play Support v0.97 (c) Adam Belay\n");
         return bus_register(&pnp_bus_type);
 }
 
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 0bdf9b8a5e58..d15e2b77af88 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
          */
         for_each_pci_dev(pdev) {
                 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                        unsigned int type;
+                        unsigned long type;
 
                         type = pci_resource_flags(pdev, i) &
                                         (IORESOURCE_IO | IORESOURCE_MEM);
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 4cfe3a1efdfb..dbae23acdd5b 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -467,14 +467,14 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
 #endif
 }
 
-int pnp_resource_type(struct resource *res)
+unsigned long pnp_resource_type(struct resource *res)
 {
         return res->flags & (IORESOURCE_IO  | IORESOURCE_MEM |
                              IORESOURCE_IRQ | IORESOURCE_DMA);
 }
 
 struct resource *pnp_get_resource(struct pnp_dev *dev,
-                                  unsigned int type, unsigned int num)
+                                  unsigned long type, unsigned int num)
 {
         struct pnp_resource *pnp_res;
         struct resource *res;