diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:48:51 +0100 |
| commit | 22e254480982a45b44b425a25f3262b72da4ed0d (patch) | |
| tree | 83256d0ad6ccdfe0f368283b823b855dc5ad0b2e /lib | |
| parent | db63bd8e10abf033e0a49932e2319a76b0fa9c1b (diff) | |
| parent | a81c6a9f16db267aad65f13ced0e25b91cbca179 (diff) | |
| download | barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.gz barebox-22e254480982a45b44b425a25f3262b72da4ed0d.tar.xz | |
Merge branch 'for-next/compile-log-level'
Conflicts:
drivers/usb/host/ehci-hcd.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gui/bmp.c | 2 | ||||
| -rw-r--r-- | lib/xfuncs.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gui/bmp.c b/lib/gui/bmp.c index fce0e69b77..6bf8cd000f 100644 --- a/lib/gui/bmp.c +++ b/lib/gui/bmp.c @@ -24,7 +24,7 @@ struct image *bmp_open(char *inbuf, int insize) img->bits_per_pixel = le16_to_cpu(bmp->header.bit_count); pr_debug("bmp: %d x %d x %d data@0x%p\n", img->width, img->height, - img->bit_per_pixel, img->data); + img->bits_per_pixel, img->data); return img; } diff --git a/lib/xfuncs.c b/lib/xfuncs.c index 4649280329..db85720195 100644 --- a/lib/xfuncs.c +++ b/lib/xfuncs.c @@ -30,7 +30,7 @@ void *xmalloc(size_t size) if (!(p = malloc(size))) panic("ERROR: out of memory\n"); - debug("xmalloc %p (size %d)\n", p, size); + debug("xmalloc %p (size %zu)\n", p, size); return p; } @@ -43,7 +43,7 @@ void *xrealloc(void *ptr, size_t size) if (!(p = realloc(ptr, size))) panic("ERROR: out of memory\n"); - debug("xrealloc %p -> %p (size %d)\n", ptr, p, size); + debug("xrealloc %p -> %p (size %zu)\n", ptr, p, size); return p; } |