Input: fix ordering in joystick Makefile

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

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 5e382470faa27fdb538e263ed6e83dee556d7f47..80c5f1ba2e49c4045269085b33155239f8d7cd9f 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>
 
@@ -24,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
+#include <linux/interrupt.h>
 
 #include "rio.h"
 
@@ -477,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;
                }