Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / ehca_tools.h

diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h
index 21f7d06f14ad2f1ed9e5ede9f6323a9007a2106f..f09914cccf53c6597db58a971e62c7a16bfcd879 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_tools.h
+++ b/drivers/infiniband/hw/ehca/ehca_tools.h
@@ -116,7 +116,7 @@ extern int ehca_debug_level;
                unsigned char *deb = (unsigned char *)(adr); \
                for (x = 0; x < l; x += 16) { \
                        printk(KERN_INFO "EHCA_DMP:%s " format \
-                              " adr=%p ofs=%04x %016lx %016lx\n", \
+                              " adr=%p ofs=%04x %016llx %016llx\n", \
                               __func__, ##args, deb, x, \
                               *((u64 *)&deb[0]), *((u64 *)&deb[8])); \
                        deb += 16; \