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 /arch/arm/mach-socfpga | |
| 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 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/generic.c b/arch/arm/mach-socfpga/generic.c index 0d958d23af..62593549d6 100644 --- a/arch/arm/mach-socfpga/generic.c +++ b/arch/arm/mach-socfpga/generic.c @@ -97,7 +97,7 @@ static int socfpga_env_init(void) } mkdir("/boot", 0666); - ret = mount(partname, "fat", "/boot"); + ret = mount(partname, "fat", "/boot", NULL); if (ret) { printf("failed to mount %s\n", diskdev); goto out_free; |