Merge commit 'v2.6.32-rc8' into HEAD

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index d1d89c4491ad..7dfbee1dcd76 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -537,8 +537,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
         u_char map;
 
         debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, "
-                  "%#lx-%#lx)\n", sock, io->map, io->flags,
-                  io->speed, io->start, io->stop);
+                  "%#llx-%#llx)\n", sock, io->map, io->flags,
+                  io->speed, (unsigned long long)io->start,
+                  (unsigned long long)io->stop);
         map = io->map;
 
         return 0;
@@ -554,8 +555,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem)
         pcc_socket_t *t = &socket[sock];
 
         debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, "
-                 "%#lx, %#x)\n", sock, map, mem->flags,
-                 mem->speed, mem->static_start, mem->card_start);
+                 "%#llx, %#x)\n", sock, map, mem->flags,
+                 mem->speed, (unsigned long long)mem->static_start,
+                 mem->card_start);
 
         /*
          * sanity check