Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / rapidio / rio.c

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 3ca1011ceaac7fa24b6b2e42c2365201d9495188..680661abbc4b700ce537a8ad828124be26821187 100644 (file)
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -11,7 +11,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 
@@ -23,6 +22,8 @@
 #include <linux/rio_regs.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
+#include <linux/interrupt.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);
 
-       return (RIO_GET_DID(result));
+       return (RIO_GET_DID(port->sys_size, result));
 }
 
 /**
@@ -476,8 +477,8 @@ int rio_init_mports(void)
                                        port->iores.end - port->iores.start,
                                        port->name)) {
                        printk(KERN_ERR
-                              "RIO: Error requesting master port region %8.8lx-%8.8lx\n",
-                              port->iores.start, port->iores.end - 1);
+                              "RIO: Error requesting master port region 0x%016llx-0x%016llx\n",
+                              (u64)port->iores.start, (u64)port->iores.end - 1);
                        rc = -ENOMEM;
                        goto out;
                }