finished merge

diff --git a/commands/usbtest.c b/commands/usbtest.c
index 1c49d8104dfdd10ffb4afa9ba66d55dab442bf7d..3405c3b4dc0ee50bb67af900653a11eacf38eaf8 100644 (file)
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -19,6 +19,7 @@
 
 #include <grub/types.h>
 #include <grub/misc.h>
+#include <grub/charset.h>
 #include <grub/mm.h>
 #include <grub/err.h>
 #include <grub/dl.h>