diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:09 +0100 |
| commit | a8a08f88cc8c2c78bcc421cd55144813b081bcec (patch) | |
| tree | 67e818ea7ce5ab531251467e13fa3ec3e18e11c7 /fs | |
| parent | 2331b1d8e8d7aabe52b4fd65ca200cf8288aec88 (diff) | |
| parent | d0343211a27b982c3ef61597b68a6bf76df887af (diff) | |
| download | barebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.gz barebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
common/environment.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bpkfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bpkfs.c b/fs/bpkfs.c index b3b45be76d..8352307e59 100644 --- a/fs/bpkfs.c +++ b/fs/bpkfs.c @@ -12,7 +12,6 @@ #include <fs.h> #include <errno.h> #include <fcntl.h> -#include <fs.h> #include <malloc.h> #include <init.h> #include <linux/stat.h> @@ -438,7 +437,7 @@ static int bpkfs_probe(struct device_d *dev) dev_dbg(dev, "%d: type = 0x%x => %s\n", i, d->type, d->name); dev_dbg(dev, "%d: size = %llu\n", i, d->size); - dev_dbg(dev, "%d: offset = %d\n", i, d->offset); + dev_dbg(dev, "%d: offset = %zu\n", i, d->offset); dev_dbg(dev, "%d: hw_id = 0x%x => %s\n", i, h->hw_id, h->name); |