Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.
Showing the changes to samples (1 of 549 files). Show all
Unified · Split
| @@ -245,7 +245,7 @@ int main(int argc, char *argv[]) · 244 unmodified lines | |||
| 245 | 245 | ||
| 246 | if (argc != 2) { | 246 | if (argc != 2) { |
| 247 | printf( | 247 | printf( |
| 248 | "Sintax: %s fbdev\n" | 248 | "Syntax: %s fbdev\n" |
| 249 | "Usually: /dev/fb0, /dev/fb1...\n", argv[0]); | 249 | "Usually: /dev/fb0, /dev/fb1...\n", argv[0]); |
| 250 | return -1; | 250 | return -1; |
| 251 | } | 251 | } |