~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to grub-core/loader/i386/bsd.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
ImportĀ upstreamĀ versionĀ 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
#include <grub/i18n.h>
35
35
#include <grub/ns8250.h>
36
36
 
 
37
GRUB_MOD_LICENSE ("GPLv3+");
 
38
 
37
39
#include <grub/video.h>
38
40
#ifdef GRUB_MACHINE_PCBIOS
39
41
#include <grub/machine/biosnum.h>
65
67
static grub_uint32_t bootflags;
66
68
static int is_elf_kernel, is_64bit;
67
69
static grub_uint32_t openbsd_root;
68
 
struct grub_relocator *relocator = NULL;
 
70
static struct grub_relocator *relocator = NULL;
69
71
static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
70
72
 
71
73
struct bsd_tag