diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:44 +0100 |
| commit | 144358e0aa102c84968443460c508eb3d65ccc90 (patch) | |
| tree | 01b9aafde793d1124976ecd2bae090b9b978f8a3 /lib | |
| parent | e358922a74b01e6272c77caf01bc78a8295cc7d7 (diff) | |
| parent | 86f681abec4f8485d2e95537e0d59a8d9ab6b546 (diff) | |
| download | barebox-144358e0aa102c84968443460c508eb3d65ccc90.tar.gz barebox-144358e0aa102c84968443460c508eb3d65ccc90.tar.xz | |
Merge branch 'for-next/nfs'
Conflicts:
defaultenv/defaultenv-2-base/bin/ifup
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap/disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bootstrap/disk.c b/lib/bootstrap/disk.c index 879d3315e8..527e430897 100644 --- a/lib/bootstrap/disk.c +++ b/lib/bootstrap/disk.c @@ -20,7 +20,7 @@ void* bootstrap_read_disk(char *dev, char *fstype) int len; char *path = "/"; - ret = mount(dev, fstype, path); + ret = mount(dev, fstype, path, NULL); if (ret) { bootstrap_err("mounting %s failed with %d\n", dev, ret); return NULL; |