diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 06:53:47 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 20:35:07 -0500 |
commit | 5febf1cd79425d3c65d9a66a2299f0d06dc4b1eb (patch) | |
tree | c82bda91cc8c77723bab08e9104696f27a7259b8 /drivers/rapidio | |
parent | 15061d60a3be0845dc17a0fbe87610d1cc7106c7 (diff) |
[RAPIDIO] Fix compile error and warning
drivers/rapidio/rio.c: In function 'rio_get_asm':
drivers/rapidio/rio.c:413: error: implicit declaration of function 'in_interrupt'
drivers/rapidio/rio.c: In function 'rio_init_mports':
drivers/rapidio/rio.c:480: warning: format '%8.8lx' expects type 'long unsigned int', but argument 2 has type 'resource_size_t'
drivers/rapidio/rio.c:480: warning: format '%8.8lx' expects type 'long unsigned int', but argument 3 has type 'resource_size_t'
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/rapidio')
-rw-r--r-- | drivers/rapidio/rio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index f644807da2f9..80c5f1ba2e49 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/interrupt.h> | ||
26 | 27 | ||
27 | #include "rio.h" | 28 | #include "rio.h" |
28 | 29 | ||
@@ -476,8 +477,8 @@ int rio_init_mports(void) | |||
476 | port->iores.end - port->iores.start, | 477 | port->iores.end - port->iores.start, |
477 | port->name)) { | 478 | port->name)) { |
478 | printk(KERN_ERR | 479 | printk(KERN_ERR |
479 | "RIO: Error requesting master port region %8.8lx-%8.8lx\n", | 480 | "RIO: Error requesting master port region 0x%016llx-0x%016llx\n", |
480 | port->iores.start, port->iores.end - 1); | 481 | (u64)port->iores.start, (u64)port->iores.end - 1); |
481 | rc = -ENOMEM; | 482 | rc = -ENOMEM; |
482 | goto out; | 483 | goto out; |
483 | } | 484 | } |