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 /common/menu.c | |
| 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 'common/menu.c')
| -rw-r--r-- | common/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/menu.c b/common/menu.c index 4cefadb412..54f2c71b29 100644 --- a/common/menu.c +++ b/common/menu.c @@ -468,7 +468,7 @@ static void menu_action_command(struct menu *m, struct menu_entry *me) if (!s) s = e->command; - ret = run_command (s, 0); + ret = run_command(s); if (ret < 0) udelay(1000000); |