diff options
-rw-r--r-- | drivers/pnp/base.h | 2 | ||||
-rw-r--r-- | drivers/pnp/quirks.c | 2 | ||||
-rw-r--r-- | drivers/pnp/resource.c | 4 | ||||
-rw-r--r-- | include/linux/pnp.h | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/pnp/base.h b/drivers/pnp/base.h index 9fd7bb9b7dce..7cc7bf5304aa 100644 --- a/drivers/pnp/base.h +++ b/drivers/pnp/base.h | |||
@@ -147,7 +147,7 @@ char *pnp_resource_type_name(struct resource *res); | |||
147 | void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc); | 147 | void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc); |
148 | 148 | ||
149 | void pnp_free_resources(struct pnp_dev *dev); | 149 | void pnp_free_resources(struct pnp_dev *dev); |
150 | int pnp_resource_type(struct resource *res); | 150 | unsigned long pnp_resource_type(struct resource *res); |
151 | 151 | ||
152 | struct pnp_resource { | 152 | struct pnp_resource { |
153 | struct list_head list; | 153 | struct list_head list; |
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) | |||
245 | */ | 245 | */ |
246 | for_each_pci_dev(pdev) { | 246 | for_each_pci_dev(pdev) { |
247 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { | 247 | for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { |
248 | unsigned int type; | 248 | unsigned long type; |
249 | 249 | ||
250 | type = pci_resource_flags(pdev, i) & | 250 | type = pci_resource_flags(pdev, i) & |
251 | (IORESOURCE_IO | IORESOURCE_MEM); | 251 | (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) | |||
467 | #endif | 467 | #endif |
468 | } | 468 | } |
469 | 469 | ||
470 | int pnp_resource_type(struct resource *res) | 470 | unsigned long pnp_resource_type(struct resource *res) |
471 | { | 471 | { |
472 | return res->flags & (IORESOURCE_IO | IORESOURCE_MEM | | 472 | return res->flags & (IORESOURCE_IO | IORESOURCE_MEM | |
473 | IORESOURCE_IRQ | IORESOURCE_DMA); | 473 | IORESOURCE_IRQ | IORESOURCE_DMA); |
474 | } | 474 | } |
475 | 475 | ||
476 | struct resource *pnp_get_resource(struct pnp_dev *dev, | 476 | struct resource *pnp_get_resource(struct pnp_dev *dev, |
477 | unsigned int type, unsigned int num) | 477 | unsigned long type, unsigned int num) |
478 | { | 478 | { |
479 | struct pnp_resource *pnp_res; | 479 | struct pnp_resource *pnp_res; |
480 | struct resource *res; | 480 | struct resource *res; |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index be764e514e35..53b70fd1d9a5 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -22,9 +22,11 @@ struct pnp_dev; | |||
22 | * Resource Management | 22 | * Resource Management |
23 | */ | 23 | */ |
24 | #ifdef CONFIG_PNP | 24 | #ifdef CONFIG_PNP |
25 | struct resource *pnp_get_resource(struct pnp_dev *, unsigned int, unsigned int); | 25 | struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned long type, |
26 | unsigned int num); | ||
26 | #else | 27 | #else |
27 | static inline struct resource *pnp_get_resource(struct pnp_dev *dev, unsigned int type, unsigned int num) | 28 | static inline struct resource *pnp_get_resource(struct pnp_dev *dev, |
29 | unsigned long type, unsigned int num) | ||
28 | { | 30 | { |
29 | return NULL; | 31 | return NULL; |
30 | } | 32 | } |