diff options
| author | Rene Herman | 2008-10-16 07:03:58 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-16 20:21:45 +0200 |
| commit | b563cf59c4d67da7d671788a9848416bfa4180ab (patch) | |
| tree | 0b67e9264962cc216ac0d3aeed1b2fa0e8d65a8b /drivers/pnp/resource.c | |
| parent | pnp: remove printk() with outdated version (diff) | |
| download | kernel-qcow2-linux-b563cf59c4d67da7d671788a9848416bfa4180ab.tar.gz kernel-qcow2-linux-b563cf59c4d67da7d671788a9848416bfa4180ab.tar.xz kernel-qcow2-linux-b563cf59c4d67da7d671788a9848416bfa4180ab.zip | |
pnp: make the resource type an unsigned long
PnP encodes the resource type directly as its struct resource->flags value
which is an unsigned long. Make it so...
Signed-off-by: Rene Herman <rene.herman@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp/resource.c')
| -rw-r--r-- | drivers/pnp/resource.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |