merge mainline into net

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-16 18:00:16 +01:00
commit ec08f14936
2 changed files with 6 additions and 1 deletions

View file

@ -32,7 +32,7 @@
GRUB_MOD_LICENSE ("GPLv3+");
/* Real mode IVT slot (seg:off far pointer) for interrupt 0x13. */
static grub_uint32_t *const int13slot = (void *) (4 * 0x13);
static grub_uint32_t *const int13slot = (grub_uint32_t *) (4 * 0x13);
/* Remember to update enum opt_idxs accordingly. */
static const struct grub_arg_option options[] = {