Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-25 16:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm/term: Fix linking error due multiple ps2_state definitions

Browse Source 
When building with --target=arm-linux-gnu --with-platform=coreboot
a linking error occurs caused by multiple definitions of the
ps2_state variable.

Mark them as static since they aren't used outside their compilation unit.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Javier Martinez Canillas authored and Daniel Kiper committed 2020-12-11 13:53:54 +01:00
1 parent 97c20f2412
commit 860be435cb
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/term/arm/cros.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <grub/fdtbus.h> #include <grub/fdtbus.h>
#include <grub/arm/cros_ec.h> #include <grub/arm/cros_ec.h>
struct grub_ps2_state ps2_state; static struct grub_ps2_state ps2_state;
struct grub_cros_ec_keyscan old_scan; struct grub_cros_ec_keyscan old_scan;
grub-core/term/arm/pl050.c
+1 -1
View File
@@ -29,7 +29,7 @@
static volatile grub_uint32_t *pl050_regs; static volatile grub_uint32_t *pl050_regs;
struct grub_ps2_state ps2_state; static struct grub_ps2_state ps2_state;
static void static void
keyboard_controller_wait_until_ready (void) keyboard_controller_wait_until_ready (void)