From 7078b0fd2789b744cb67c45637ace853e09836e5 Mon Sep 17 00:00:00 2001
From: Rene Herman <rene.herman@keyaccess.nl>
Date: Wed, 15 Oct 2008 22:03:58 -0700
Subject: [PATCH] --- yaml --- r: 114877 b: refs/heads/master c:
 b563cf59c4d67da7d671788a9848416bfa4180ab h: refs/heads/master i:   114875:
 e5f95957f39f8b5e5c61a2c887765aa602db73ee v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/pnp/base.h     | 2 +-
 trunk/drivers/pnp/quirks.c   | 2 +-
 trunk/drivers/pnp/resource.c | 4 ++--
 trunk/include/linux/pnp.h    | 6 ++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c3c8269be52b..7a6f22baf397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a63cc18f02b941662ca5f6c33adca1aa9e8c1a96
+refs/heads/master: b563cf59c4d67da7d671788a9848416bfa4180ab
diff --git a/trunk/drivers/pnp/base.h b/trunk/drivers/pnp/base.h
index 9fd7bb9b7dce..7cc7bf5304aa 100644
--- a/trunk/drivers/pnp/base.h
+++ b/trunk/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/trunk/drivers/pnp/quirks.c b/trunk/drivers/pnp/quirks.c
index 0bdf9b8a5e58..d15e2b77af88 100644
--- a/trunk/drivers/pnp/quirks.c
+++ b/trunk/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/trunk/drivers/pnp/resource.c b/trunk/drivers/pnp/resource.c
index 4cfe3a1efdfb..dbae23acdd5b 100644
--- a/trunk/drivers/pnp/resource.c
+++ b/trunk/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;
diff --git a/trunk/include/linux/pnp.h b/trunk/include/linux/pnp.h
index be764e514e35..53b70fd1d9a5 100644
--- a/trunk/include/linux/pnp.h
+++ b/trunk/include/linux/pnp.h
@@ -22,9 +22,11 @@ struct pnp_dev;
  * Resource Management
  */
 #ifdef CONFIG_PNP
-struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int);
+struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned long type,
+				unsigned int num);
 #else
-static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num)
+static inline struct resource *pnp_get_resource(struct pnp_dev *dev,
+			unsigned long type, unsigned int num)
 {
 	return NULL;
 }