Merge branch 'master' into warning_fixes_v3

This commit is contained in:
Lorenz Meier
2014-06-30 12:31:51 +02:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ nshterm_main(int argc, char *argv[])
printf("Usage: nshterm <device>\n");
exit(1);
}
uint8_t retries = 0;
unsigned retries = 0;
int fd = -1;
/* try the first 30 seconds */