Correct some compile erros.

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index e242d8ecece19cc28d965fc36eb6ea9a7f8386fb..e1e1623e64e822a57732f9805c5a9e6b5409d7c8 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1503,7 +1503,7 @@ module = {
 module = {
   name = emunet;
   emu = net/drivers/emu/emunet.c;
-  enable = ieee1275;
+  enable = emu;
 };
 
 module = {

diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
index fed4f7e76e53c9656d16ef584e126e30828d27e2..3473fe362027fcb6cf235d280c0a6371811d3b8f 100644 (file)
--- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c
@@ -25,7 +25,6 @@
 #include <grub/ieee1275/ofnet.h>
 #include <grub/net/ieee1275/interface.h>
 #include <grub/net.h>
-#include <grub/net/disknet.h>
 #include <grub/net/tftp.h>
 
 grub_bootp_t (*grub_getbootp) (void);

diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
index 4067e36cf57feee8777d71ed985f2d2ba9255606..44738c67a6d95dafb9117f41d7d38703dd7c44d4 100644 (file)
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -1,4 +1,5 @@
 #include <grub/net/netbuff.h>
+#include <grub/net/ethernet.h>
 #include <grub/ieee1275/ofnet.h>
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/dl.h>

diff --git a/include/grub/net.h b/include/grub/net.h
index 59974b94fac58789189627f5cb357be5c4e87905..cb6db06d82f0d7f43244c153a8a454752e2f770c 100644 (file)
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -434,7 +434,5 @@ grub_net_send_ip_packet (struct grub_net_network_level_interface *inf,
 void
 grub_net_pool_cards (unsigned time);
 
-void
-hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str);
-
+extern grub_err_t (*EXPORT_VAR (grub_file_net_close)) (grub_file_t file);
 #endif /* ! GRUB_NET_HEADER */