2 files changed, 4 insertions, 5 deletions

diff --git a/arch/sh/boards/renesas/r7780rp/Kconfig b/arch/sh/boards/renesas/r7780rp/Kconfig
index 9fb11641fe13..fc8f28e04ba3 100644
--- a/arch/sh/boards/renesas/r7780rp/Kconfig
+++ b/arch/sh/boards/renesas/r7780rp/Kconfig
@@ -6,18 +6,18 @@ choice
 
 config SH_R7780RP
         bool "R7780RP-1 board support"
-        select CPU_SUBTYPE_SH7780
+        depends on CPU_SUBTYPE_SH7780
 
 config SH_R7780MP
         bool "R7780MP board support"
-        select CPU_SUBTYPE_SH7780
+        depends on CPU_SUBTYPE_SH7780
         help
           Selecting this option will enable support for the mass-production
           version of the R7780RP. If in doubt, say Y.
 
 config SH_R7785RP
         bool "R7785RP board support"
-        select CPU_SUBTYPE_SH7785
+        depends on CPU_SUBTYPE_SH7785
 
 endchoice
 
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index 0727ef92f2b3..5afb864a1ec5 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -166,10 +166,9 @@ static void __init highlander_setup(char **cmdline_p)
 /*
  * The Machine Vector
  */
-struct sh_machine_vector mv_highlander __initmv = {
+static struct sh_machine_vector mv_highlander __initmv = {
         .mv_name                = "Highlander",
         .mv_nr_irqs             = 109,
         .mv_setup               = highlander_setup,
         .mv_init_irq            = highlander_init_irq,
 };
-ALIAS_MV(highlander)