From: BVK Chaitanya <bvk@dbook>
Date: Thu, 12 Aug 2010 06:32:48 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~665^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=163dd4f7e9e7eed5ab8c40cd7032a88292f0f327;p=thirdparty%2Fgrub.git

merge with mainline
---

163dd4f7e9e7eed5ab8c40cd7032a88292f0f327
diff --cc util/grub-script-check.c
index 550a56284,ac59d5fcc..4ca85c4bd
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@@ -65,15 -65,6 +65,14 @@@ grub_script_break (grub_command_t cmd _
    return 0;
  }
  
 +grub_err_t
 +grub_script_shift (grub_command_t cmd __attribute__((unused)),
 +		   int argc __attribute__((unused)),
 +		   char *argv[] __attribute__((unused)))
 +{
 +  return 0;
 +}
 +
- 
  char *
  grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
  {