mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
afb0baacd6
The BLS config filenames are guaranteed to be unique, so they can be used as GRUB2 entry id and can also be used to sort the menu entries. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sun, 9 Jul 2017 21:31:19 +0200
|
|
Subject: [PATCH 046/250] ehci: Fix compilation on i386
|
|
|
|
---
|
|
grub-core/bus/usb/ehci.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c
|
|
index 7b7061f5335..d966fc21002 100644
|
|
--- a/grub-core/bus/usb/ehci.c
|
|
+++ b/grub-core/bus/usb/ehci.c
|
|
@@ -505,7 +505,7 @@ grub_ehci_init_device (volatile void *regs)
|
|
|
|
grub_dprintf ("ehci",
|
|
"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llxx\n",
|
|
- (unsigned long long) e->iobase_ehcc + caplen);
|
|
+ (unsigned long long) (grub_addr_t) e->iobase_ehcc + caplen);
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
|
|
grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
|
|
@@ -697,7 +697,7 @@ grub_ehci_init_device (volatile void *regs)
|
|
|
|
grub_dprintf ("ehci",
|
|
"EHCI grub_ehci_pci_iter: iobase of oper. regs: %08llx\n",
|
|
- (unsigned long long) regs);
|
|
+ (unsigned long long) (grub_addr_t) regs);
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n",
|
|
grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND));
|
|
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n",
|
|
--
|
|
2.17.1
|
|
|