Fix spurious diffs with master

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index f7b0b51c65919544f955b4f9cb83be2c0b0ec6e6..3e1f0cf09e207a07589e199b1f623dbd6d24d68a 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -847,7 +847,7 @@ module = {
   common = commands/gptsync.c;
 };
 
-/*module = {
+module = {
   name = halt;
   nopc = commands/halt.c;
   i386_pc = commands/i386/pc/halt.c;
@@ -884,7 +884,7 @@ module = {
   uboot = lib/uboot/reboot.c;
   arm_coreboot = lib/dummy/reboot.c;
   common = commands/reboot.c;
-};*/
+};
 
 module = {
   name = hashsum;

diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S
index 6ba15708bc77f6ca7e833000ac706bbf102ce7bb..5ae76a3d819c002676f54db3311f517791e0c4e8 100644 (file)
--- a/grub-core/kern/arm/cache_armv7.S
+++ b/grub-core/kern/arm/cache_armv7.S
@@ -135,4 +135,4 @@ clean_invalidate_dcache:
        pop     {r4-r12, lr}
        bx      lr
 
-#include "cache.S"
+#include "cache.S"
\ No newline at end of file

diff --git a/include/grub/uboot/uboot.h b/include/grub/uboot/uboot.h
index 5ca1a7f635b6c64e0ec168862b810a653f4932c1..c122de6abf68a8ecff6f62c230e93ec005551a3e 100644 (file)
--- a/include/grub/uboot/uboot.h
+++ b/include/grub/uboot/uboot.h
@@ -37,7 +37,7 @@ grub_err_t grub_uboot_probe_hardware (void);
 extern grub_addr_t EXPORT_VAR (start_of_ram);
 
 grub_uint32_t EXPORT_FUNC (grub_uboot_get_machine_type) (void);
-const void *EXPORT_FUNC (grub_uboot_get_boot_data) (void);
+grub_addr_t EXPORT_FUNC (grub_uboot_get_boot_data) (void);
 
 
 /*