summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/m32r_pcc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:14:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:14:14 -0700
commit49b766ec12650db38e98caafa3cd94e8ff59000c (patch)
treebe70876001af55af3759f117c4bded2b267315bf /drivers/pcmcia/m32r_pcc.c
parent464d155c51db3fc31908cef4101c51c11d3f2a45 (diff)
parent94efb72328afa29ea5fd93e48ed17489afcdaa12 (diff)
downloadlwn-49b766ec12650db38e98caafa3cd94e8ff59000c.tar.gz
lwn-49b766ec12650db38e98caafa3cd94e8ff59000c.zip
Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: do not load the pd6729 driver if io_base is NULL pcmcia: Fix possible printk format warnings pcmcia: do not try to store more than 4 version strings pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe pcmcia: fix controller printk format warnings
Diffstat (limited to 'drivers/pcmcia/m32r_pcc.c')
-rw-r--r--drivers/pcmcia/m32r_pcc.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index a0655839c8d3..c6524f99ccc3 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -492,8 +492,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map;
debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
- "%#x-%#x)\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;
@@ -515,8 +516,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem)
#endif
debug(3, "m32r-pcc: 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