From 1ef7e2992dd55808333ad1acc8ebe77bd962e5a7 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 18 Jan 2010 16:03:57 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20mismerge=20resulting=20in=20ghost=20multi?= =?UTF-8?q?boot=20module.=20Reported=20by:=20Gr=C3=A9goire=20Sutre.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loader/i386/multiboot.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c index 8186e8cca..3c743c85f 100644 --- a/loader/i386/multiboot.c +++ b/loader/i386/multiboot.c @@ -303,11 +303,6 @@ grub_module (int argc, char *argv[]) if (err) goto fail; - err = grub_multiboot_add_module ((grub_addr_t) module, size, - argc - 1, argv + 1); - if (err) - goto fail; - if (grub_file_read (file, module, size) != size) { grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");