diff --git a/stage2/builtins.c b/stage2/builtins.c
index c9398d1..52b2e2a 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -5851,6 +5851,7 @@ find_func (char *arg, int flags)
   //char *in_drives = NULL;	/* search in drive list */
 //  char root_found[16];
   errnum = 0;
+  int i = 0;
 #ifdef FSYS_FB
   if (saved_drive == FB_DRIVE && !(unsigned char)(fb_status >> 8))
   {
@@ -5883,7 +5884,6 @@ find_func (char *arg, int flags)
       }
 		else if (grub_memcmp(arg, "--devices=", 10) == 0)
 		{
-			int i = 0;
 			arg += 10;
 			while (i < 7 && *arg >= 'a')
 			{
@@ -6011,7 +6011,6 @@ find_func (char *arg, int flags)
 				else
 					continue;
 #endif
-        int i;
         for (drive = 0xa0; drive <= 0xff; drive++)
         {
           for (i = 0; i < DRIVE_MAP_SIZE; i++)