git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
rapidio
/
rio.c
diff --git
a/drivers/rapidio/rio.c
b/drivers/rapidio/rio.c
index
f644807
..
6395c78
100644
(file)
--- a/
drivers/rapidio/rio.c
+++ b/
drivers/rapidio/rio.c
@@
-23,6
+23,7
@@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
+#include <linux/interrupt.h>
#include "rio.h"
#include "rio.h"
@@
-42,7
+43,7
@@
u16 rio_local_get_device_id(struct rio_mport *port)
rio_local_read_config_32(port, RIO_DID_CSR, &result);
rio_local_read_config_32(port, RIO_DID_CSR, &result);
- return (RIO_GET_DID(result));
+ return (RIO_GET_DID(
port->sys_size,
result));
}
/**
}
/**
@@
-466,7
+467,7
@@
static int __devinit rio_init(void)
device_initcall(rio_init);
device_initcall(rio_init);
-int rio_init_mports(void)
+int
__devinit
rio_init_mports(void)
{
int rc = 0;
struct rio_mport *port;
{
int rc = 0;
struct rio_mport *port;
@@
-476,8
+477,8
@@
int rio_init_mports(void)
port->iores.end - port->iores.start,
port->name)) {
printk(KERN_ERR
port->iores.end - port->iores.start,
port->name)) {
printk(KERN_ERR
- "RIO: Error requesting master port region
%8.8lx-%8.8
lx\n",
-
port->iores.start,
port->iores.end - 1);
+ "RIO: Error requesting master port region
0x%016llx-0x%016l
lx\n",
+
(u64)port->iores.start, (u64)
port->iores.end - 1);
rc = -ENOMEM;
goto out;
}
rc = -ENOMEM;
goto out;
}