From: Javier Martinez Canillas Date: Thu, 3 Dec 2020 15:01:44 +0000 (+0100) Subject: arm/term: Fix linking error due multiple ps2_state definitions X-Git-Tag: grub-2.06-rc1~177 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=860be435cb0a1e3eadfefb1201059ccda7cbb627;p=thirdparty%2Fgrub.git arm/term: Fix linking error due multiple ps2_state definitions 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 Reviewed-by: Daniel Kiper --- diff --git a/grub-core/term/arm/cros.c b/grub-core/term/arm/cros.c index 1ff9f8ccf..a17e49c32 100644 --- a/grub-core/term/arm/cros.c +++ b/grub-core/term/arm/cros.c @@ -30,7 +30,7 @@ #include #include -struct grub_ps2_state ps2_state; +static struct grub_ps2_state ps2_state; struct grub_cros_ec_keyscan old_scan; diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c index e4cda3056..b082243b0 100644 --- a/grub-core/term/arm/pl050.c +++ b/grub-core/term/arm/pl050.c @@ -29,7 +29,7 @@ static volatile grub_uint32_t *pl050_regs; -struct grub_ps2_state ps2_state; +static struct grub_ps2_state ps2_state; static void keyboard_controller_wait_until_ready (void)